Replace open coded acpi_match_device() in asus_wireless_add().
Signed-off-by: Andy Shevchenko <[email protected]>
---
v3: rewrote error path logic (Hans)
v2: fixed compilation error
drivers/platform/x86/asus-wireless.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c
index abf01e00b799..1a571efa02eb 100644
--- a/drivers/platform/x86/asus-wireless.c
+++ b/drivers/platform/x86/asus-wireless.c
@@ -148,16 +148,12 @@ static int asus_wireless_add(struct acpi_device *adev)
if (err)
return err;
- for (id = device_ids; id->id[0]; id++) {
- if (!strcmp((char *) id->id, acpi_device_hid(adev))) {
- data->hswc_params =
- (const struct hswc_params *)id->driver_data;
- break;
- }
- }
- if (!data->hswc_params)
+ id = acpi_match_device(device_ids, adev);
+ if (!id)
return 0;
+ data->hswc_params = (const struct hswc_params *)id->driver_data;
+
data->wq = create_singlethread_workqueue("asus_wireless_workqueue");
if (!data->wq)
return -ENOMEM;
--
2.40.0.1.gaa8946217a0b
Hi,
On 10/6/23 17:53, Andy Shevchenko wrote:
> Replace open coded acpi_match_device() in asus_wireless_add().
>
> Signed-off-by: Andy Shevchenko <[email protected]>
> ---
> v3: rewrote error path logic (Hans)
> v2: fixed compilation error
> drivers/platform/x86/asus-wireless.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
Thanks, patch looks good to me now:
Reviewed-by: Hans de Goede <[email protected]>
Regards,
Hans
>
> diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c
> index abf01e00b799..1a571efa02eb 100644
> --- a/drivers/platform/x86/asus-wireless.c
> +++ b/drivers/platform/x86/asus-wireless.c
> @@ -148,16 +148,12 @@ static int asus_wireless_add(struct acpi_device *adev)
> if (err)
> return err;
>
> - for (id = device_ids; id->id[0]; id++) {
> - if (!strcmp((char *) id->id, acpi_device_hid(adev))) {
> - data->hswc_params =
> - (const struct hswc_params *)id->driver_data;
> - break;
> - }
> - }
> - if (!data->hswc_params)
> + id = acpi_match_device(device_ids, adev);
> + if (!id)
> return 0;
>
> + data->hswc_params = (const struct hswc_params *)id->driver_data;
> +
> data->wq = create_singlethread_workqueue("asus_wireless_workqueue");
> if (!data->wq)
> return -ENOMEM;
On Fri, Oct 06, 2023 at 07:08:35PM +0200, Hans de Goede wrote:
> On 10/6/23 17:53, Andy Shevchenko wrote:
...
> Thanks, patch looks good to me now:
> Reviewed-by: Hans de Goede <[email protected]>
Thanks, but it seems something went wrong (most likely due to age of the
patches in my local tree) and confusing "BUILD SUCCESS" from LKP.
> > + id = acpi_match_device(device_ids, adev);
This should be acpi_match_acpi_device().
> > + if (!id)
> > return 0;
--
With Best Regards,
Andy Shevchenko