[PATCH v1 1/1] platform/x86: xo15-ebook: Replace open coded acpi_match_device()

[PATCH v1 1/1] platform/x86: xo15-ebook: Replace open coded acpi_match_device()

[Andy Shevchenko]

Replace open coded acpi_match_device() in ebook_switch_add().

Note, while it is a bit longer it is more robust in case more ID
are coming.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/xo15-ebook.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/xo15-ebook.c b/drivers/platform/x86/xo15-ebook.c
index 97440462aa25..40b2dd4ae5ea 100644
--- a/drivers/platform/x86/xo15-ebook.c
+++ b/drivers/platform/x86/xo15-ebook.c
@@ -81,9 +81,9 @@ static SIMPLE_DEV_PM_OPS(ebook_switch_pm, NULL, ebook_switch_resume);
 
 static int ebook_switch_add(struct acpi_device *device)
 {
+	const struct acpi_device_id *id;
 	struct ebook_switch *button;
 	struct input_dev *input;
-	const char *hid = acpi_device_hid(device);
 	char *name, *class;
 	int error;
 
@@ -102,8 +102,9 @@ static int ebook_switch_add(struct acpi_device *device)
 	name = acpi_device_name(device);
 	class = acpi_device_class(device);
 
-	if (strcmp(hid, XO15_EBOOK_HID)) {
-		pr_err("Unsupported hid [%s]\n", hid);
+	id = acpi_match_device(device, ebook_device_ids);
+	if (!id) {
+		dev_err(&device->dev, "Unsupported hid\n");
 		error = -ENODEV;
 		goto err_free_input;
 	}
@@ -111,7 +112,7 @@ static int ebook_switch_add(struct acpi_device *device)
 	strcpy(name, XO15_EBOOK_DEVICE_NAME);
 	sprintf(class, "%s/%s", XO15_EBOOK_CLASS, XO15_EBOOK_SUBCLASS);
 
-	snprintf(button->phys, sizeof(button->phys), "%s/button/input0", hid);
+	snprintf(button->phys, sizeof(button->phys), "%s/button/input0", id->id);
 
 	input->name = name;
 	input->phys = button->phys;
-- 
2.35.1

Re: [PATCH v1 1/1] platform/x86: xo15-ebook: Replace open coded acpi_match_device()

[kernel test robot]

Hi Andy,

I love your patch! Yet something to improve:

[auto build test ERROR on linus/master]
[also build test ERROR on platform-drivers-x86/for-next v5.19-rc4 next-20220630]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/Andy-Shevchenko/platform-x86-xo15-ebook-Replace-open-coded-acpi_match_device/20220701-034437
base:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 1a0e93df1e107dc766fdf86ae88076efd9f376e6
config: i386-allyesconfig (https://download.01.org/0day-ci/archive/20220701/202207010755.roKVlMYX-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-3) 11.3.0
reproduce (this is a W=1 build):
        # https://github.com/intel-lab-lkp/linux/commit/5b5e8dde0af27d441c9249e4b6a2710c125d0b65
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Andy-Shevchenko/platform-x86-xo15-ebook-Replace-open-coded-acpi_match_device/20220701-034437
        git checkout 5b5e8dde0af27d441c9249e4b6a2710c125d0b65
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash

If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   drivers/platform/x86/xo15-ebook.c: In function 'ebook_switch_add':
>> drivers/platform/x86/xo15-ebook.c:105:32: error: passing argument 1 of 'acpi_match_device' from incompatible pointer type [-Werror=incompatible-pointer-types]
     105 |         id = acpi_match_device(device, ebook_device_ids);
         |                                ^~~~~~
         |                                |
         |                                struct acpi_device *
   In file included from drivers/platform/x86/xo15-ebook.c:17:
   include/linux/acpi.h:713:77: note: expected 'const struct acpi_device_id *' but argument is of type 'struct acpi_device *'
     713 | const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
         |                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
   drivers/platform/x86/xo15-ebook.c:105:40: error: passing argument 2 of 'acpi_match_device' from incompatible pointer type [-Werror=incompatible-pointer-types]
     105 |         id = acpi_match_device(device, ebook_device_ids);
         |                                        ^~~~~~~~~~~~~~~~
         |                                        |
         |                                        const struct acpi_device_id *
   In file included from drivers/platform/x86/xo15-ebook.c:17:
   include/linux/acpi.h:714:69: note: expected 'const struct device *' but argument is of type 'const struct acpi_device_id *'
     714 |                                                const struct device *dev);
         |                                                ~~~~~~~~~~~~~~~~~~~~~^~~
   cc1: some warnings being treated as errors


vim +/acpi_match_device +105 drivers/platform/x86/xo15-ebook.c

    81	
    82	static int ebook_switch_add(struct acpi_device *device)
    83	{
    84		const struct acpi_device_id *id;
    85		struct ebook_switch *button;
    86		struct input_dev *input;
    87		char *name, *class;
    88		int error;
    89	
    90		button = kzalloc(sizeof(struct ebook_switch), GFP_KERNEL);
    91		if (!button)
    92			return -ENOMEM;
    93	
    94		device->driver_data = button;
    95	
    96		button->input = input = input_allocate_device();
    97		if (!input) {
    98			error = -ENOMEM;
    99			goto err_free_button;
   100		}
   101	
   102		name = acpi_device_name(device);
   103		class = acpi_device_class(device);
   104	
 > 105		id = acpi_match_device(device, ebook_device_ids);
   106		if (!id) {
   107			dev_err(&device->dev, "Unsupported hid\n");
   108			error = -ENODEV;
   109			goto err_free_input;
   110		}
   111	
   112		strcpy(name, XO15_EBOOK_DEVICE_NAME);
   113		sprintf(class, "%s/%s", XO15_EBOOK_CLASS, XO15_EBOOK_SUBCLASS);
   114	
   115		snprintf(button->phys, sizeof(button->phys), "%s/button/input0", id->id);
   116	
   117		input->name = name;
   118		input->phys = button->phys;
   119		input->id.bustype = BUS_HOST;
   120		input->dev.parent = &device->dev;
   121	
   122		input->evbit[0] = BIT_MASK(EV_SW);
   123		set_bit(SW_TABLET_MODE, input->swbit);
   124	
   125		error = input_register_device(input);
   126		if (error)
   127			goto err_free_input;
   128	
   129		ebook_send_state(device);
   130	
   131		if (device->wakeup.flags.valid) {
   132			/* Button's GPE is run-wake GPE */
   133			acpi_enable_gpe(device->wakeup.gpe_device,
   134					device->wakeup.gpe_number);
   135			device_set_wakeup_enable(&device->dev, true);
   136		}
   137	
   138		return 0;
   139	
   140	 err_free_input:
   141		input_free_device(input);
   142	 err_free_button:
   143		kfree(button);
   144		return error;
   145	}
   146	

-- 
0-DAY CI Kernel Test Service
https://01.org/lkp

Re: [PATCH v1 1/1] platform/x86: xo15-ebook: Replace open coded acpi_match_device()

[Andy Shevchenko]

On Thu, Jun 30, 2022 at 10:43:35PM +0300, Andy Shevchenko wrote:
> Replace open coded acpi_match_device() in ebook_switch_add().
> 
> Note, while it is a bit longer it is more robust in case more ID
> are coming.

Discard this, a last minute change that makes it not buildable.

-- 
With Best Regards,
Andy Shevchenko