include: sbi: Remove extid parameter from vendor_ext_provider() callback

The extid parameter of vendor_ext_provider() is redundant so let us
remove it.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>

diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h
index 3a629a69038c741db486e0bf14d9935a4acb91b1..546c0a61acb52f1f05333d92fc4f9bb264168eee 100644 (file)
--- a/include/sbi/sbi_platform.h
+++ b/include/sbi/sbi_platform.h
@@ -129,7 +129,7 @@ struct sbi_platform_operations {
        /** Check if SBI vendor extension is implemented or not */
        bool (*vendor_ext_check)(void);
        /** platform specific SBI extension implementation provider */
-       int (*vendor_ext_provider)(long extid, long funcid,
+       int (*vendor_ext_provider)(long funcid,
                                   const struct sbi_trap_regs *regs,
                                   unsigned long *out_value,
                                   struct sbi_trap_info *out_trap);
@@ -655,7 +655,6 @@ static inline bool sbi_platform_vendor_ext_check(
  * Invoke platform specific vendor SBI extension implementation.
  *
  * @param plat pointer to struct sbi_platform
- * @param extid        vendor SBI extension id
  * @param funcid SBI function id within the extension id
  * @param regs pointer to trap registers passed by the caller
  * @param out_value output value that can be filled by the callee
@@ -665,14 +664,14 @@ static inline bool sbi_platform_vendor_ext_check(
  */
 static inline int sbi_platform_vendor_ext_provider(
                                        const struct sbi_platform *plat,
-                                       long extid, long funcid,
+                                       long funcid,
                                        const struct sbi_trap_regs *regs,
                                        unsigned long *out_value,
                                        struct sbi_trap_info *out_trap)
 {
        if (plat && sbi_platform_ops(plat)->vendor_ext_provider) {
-               return sbi_platform_ops(plat)->vendor_ext_provider(extid,
-                                                               funcid, regs,
+               return sbi_platform_ops(plat)->vendor_ext_provider(funcid,
+                                                               regs,
                                                                out_value,
                                                                out_trap);
        }

diff --git a/lib/sbi/sbi_ecall_vendor.c b/lib/sbi/sbi_ecall_vendor.c
index 9ea5156ba102c0b4db198b4ded1f3f15a7ed1988..8b8dab00c92d6cd532a854b0207d4a6ecd22e458 100644 (file)
--- a/lib/sbi/sbi_ecall_vendor.c
+++ b/lib/sbi/sbi_ecall_vendor.c
@@ -43,7 +43,7 @@ static int sbi_ecall_vendor_handler(unsigned long extid, unsigned long funcid,
                return SBI_ERR_NOT_SUPPORTED;
 
        return sbi_platform_vendor_ext_provider(sbi_platform_thishart_ptr(),
-                                               extid, funcid, regs,
+                                               funcid, regs,
                                                out_val, out_trap);
 }
 

diff --git a/platform/generic/include/platform_override.h b/platform/generic/include/platform_override.h
index 350c3811fae7d3126e574b701bb2c920b407a3ab..0d9e5ee6b40a46a7a39a3c5395e3c82b4c04868b 100644 (file)
--- a/platform/generic/include/platform_override.h
+++ b/platform/generic/include/platform_override.h
@@ -27,7 +27,7 @@ struct platform_override {
        int (*extensions_init)(const struct fdt_match *match,
                               struct sbi_hart_features *hfeatures);
        void (*fw_init)(void *fdt, const struct fdt_match *match);
-       int (*vendor_ext_provider)(long extid, long funcid,
+       int (*vendor_ext_provider)(long funcid,
                                   const struct sbi_trap_regs *regs,
                                   unsigned long *out_value,
                                   struct sbi_trap_info *out_trap,

diff --git a/platform/generic/platform.c b/platform/generic/platform.c
index 88c3ec7e3ab8c2bfd5d9d0b64b7f796fe831801f..0b90fd7c1446edebab0717c36fbb09b7b77d85a0 100644 (file)
--- a/platform/generic/platform.c
+++ b/platform/generic/platform.c
@@ -186,12 +186,12 @@ static bool generic_vendor_ext_check(void)
                true : false;
 }
 
-static int generic_vendor_ext_provider(long extid, long funcid,
+static int generic_vendor_ext_provider(long funcid,
                                       const struct sbi_trap_regs *regs,
                                       unsigned long *out_value,
                                       struct sbi_trap_info *out_trap)
 {
-       return generic_plat->vendor_ext_provider(extid, funcid, regs,
+       return generic_plat->vendor_ext_provider(funcid, regs,
                                                 out_value, out_trap,
                                                 generic_plat_match);
 }