| Message ID | 20240106224126.13803-1-W_Armin@gmx.de (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Hans de Goede |
| Headers | show |
| Series | platform/x86: intel-wmi-sbl-fw-update: Fix function name in error message | expand |
On 1/6/24 14:41, Armin Wolf wrote: > Since when the driver was converted to use the bus-based WMI > interface, the old GUID-based WMI functions are not used anymore. > Update the error message to avoid confusing users. > > Compile-tested only. > > Fixes: 75c487fcb69c ("platform/x86: intel-wmi-sbl-fw-update: Use bus-based WMI interface") > Signed-off-by: Armin Wolf <W_Armin@gmx.de> Acked-by: Randy Dunlap <rdunlap@infradead.org> Thanks. > --- > drivers/platform/x86/intel/wmi/sbl-fw-update.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/x86/intel/wmi/sbl-fw-update.c b/drivers/platform/x86/intel/wmi/sbl-fw-update.c > index 9cf5ed0f8dc2..040153ad67c1 100644 > --- a/drivers/platform/x86/intel/wmi/sbl-fw-update.c > +++ b/drivers/platform/x86/intel/wmi/sbl-fw-update.c > @@ -32,7 +32,7 @@ static int get_fwu_request(struct device *dev, u32 *out) > return -ENODEV; > > if (obj->type != ACPI_TYPE_INTEGER) { > - dev_warn(dev, "wmi_query_block returned invalid value\n"); > + dev_warn(dev, "wmidev_block_query returned invalid value\n"); > kfree(obj); > return -EINVAL; > } > @@ -55,7 +55,7 @@ static int set_fwu_request(struct device *dev, u32 in) > > status = wmidev_block_set(to_wmi_device(dev), 0, &input); > if (ACPI_FAILURE(status)) { > - dev_err(dev, "wmi_set_block failed\n"); > + dev_err(dev, "wmidev_block_set failed\n"); > return -ENODEV; > } > > -- > 2.39.2 > >
On Sat, 6 Jan 2024, Armin Wolf wrote: > Since when the driver was converted to use the bus-based WMI > interface, the old GUID-based WMI functions are not used anymore. > Update the error message to avoid confusing users. > > Compile-tested only. > > Fixes: 75c487fcb69c ("platform/x86: intel-wmi-sbl-fw-update: Use bus-based WMI interface") > Signed-off-by: Armin Wolf <W_Armin@gmx.de> > --- > drivers/platform/x86/intel/wmi/sbl-fw-update.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/x86/intel/wmi/sbl-fw-update.c b/drivers/platform/x86/intel/wmi/sbl-fw-update.c > index 9cf5ed0f8dc2..040153ad67c1 100644 > --- a/drivers/platform/x86/intel/wmi/sbl-fw-update.c > +++ b/drivers/platform/x86/intel/wmi/sbl-fw-update.c > @@ -32,7 +32,7 @@ static int get_fwu_request(struct device *dev, u32 *out) > return -ENODEV; > > if (obj->type != ACPI_TYPE_INTEGER) { > - dev_warn(dev, "wmi_query_block returned invalid value\n"); > + dev_warn(dev, "wmidev_block_query returned invalid value\n"); > kfree(obj); > return -EINVAL; > } > @@ -55,7 +55,7 @@ static int set_fwu_request(struct device *dev, u32 in) > > status = wmidev_block_set(to_wmi_device(dev), 0, &input); > if (ACPI_FAILURE(status)) { > - dev_err(dev, "wmi_set_block failed\n"); > + dev_err(dev, "wmidev_block_set failed\n"); > return -ENODEV; > } Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Hi, On 1/6/24 23:41, Armin Wolf wrote: > Since when the driver was converted to use the bus-based WMI > interface, the old GUID-based WMI functions are not used anymore. > Update the error message to avoid confusing users. > > Compile-tested only. > > Fixes: 75c487fcb69c ("platform/x86: intel-wmi-sbl-fw-update: Use bus-based WMI interface") > Signed-off-by: Armin Wolf <W_Armin@gmx.de> Thank you for your patch, I've applied this patch to my review-hans branch: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while. I will include this patch in my next fixes pull-req to Linus for the current kernel development cycle. Regards, Hans > --- > drivers/platform/x86/intel/wmi/sbl-fw-update.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/x86/intel/wmi/sbl-fw-update.c b/drivers/platform/x86/intel/wmi/sbl-fw-update.c > index 9cf5ed0f8dc2..040153ad67c1 100644 > --- a/drivers/platform/x86/intel/wmi/sbl-fw-update.c > +++ b/drivers/platform/x86/intel/wmi/sbl-fw-update.c > @@ -32,7 +32,7 @@ static int get_fwu_request(struct device *dev, u32 *out) > return -ENODEV; > > if (obj->type != ACPI_TYPE_INTEGER) { > - dev_warn(dev, "wmi_query_block returned invalid value\n"); > + dev_warn(dev, "wmidev_block_query returned invalid value\n"); > kfree(obj); > return -EINVAL; > } > @@ -55,7 +55,7 @@ static int set_fwu_request(struct device *dev, u32 in) > > status = wmidev_block_set(to_wmi_device(dev), 0, &input); > if (ACPI_FAILURE(status)) { > - dev_err(dev, "wmi_set_block failed\n"); > + dev_err(dev, "wmidev_block_set failed\n"); > return -ENODEV; > } > > -- > 2.39.2 >
diff --git a/drivers/platform/x86/intel/wmi/sbl-fw-update.c b/drivers/platform/x86/intel/wmi/sbl-fw-update.c index 9cf5ed0f8dc2..040153ad67c1 100644 --- a/drivers/platform/x86/intel/wmi/sbl-fw-update.c +++ b/drivers/platform/x86/intel/wmi/sbl-fw-update.c @@ -32,7 +32,7 @@ static int get_fwu_request(struct device *dev, u32 *out) return -ENODEV; if (obj->type != ACPI_TYPE_INTEGER) { - dev_warn(dev, "wmi_query_block returned invalid value\n"); + dev_warn(dev, "wmidev_block_query returned invalid value\n"); kfree(obj); return -EINVAL; } @@ -55,7 +55,7 @@ static int set_fwu_request(struct device *dev, u32 in) status = wmidev_block_set(to_wmi_device(dev), 0, &input); if (ACPI_FAILURE(status)) { - dev_err(dev, "wmi_set_block failed\n"); + dev_err(dev, "wmidev_block_set failed\n"); return -ENODEV; }
Since when the driver was converted to use the bus-based WMI interface, the old GUID-based WMI functions are not used anymore. Update the error message to avoid confusing users. Compile-tested only. Fixes: 75c487fcb69c ("platform/x86: intel-wmi-sbl-fw-update: Use bus-based WMI interface") Signed-off-by: Armin Wolf <W_Armin@gmx.de> --- drivers/platform/x86/intel/wmi/sbl-fw-update.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.39.2