HID: i2c-hid: acpi: Drop unneded NULL check of adev
PATCH v2 1/2 HID: i2c-hid: acpi: Drop unneded NULL check of adev
The driver is enumerated on ACPI platforms, so adev is valid. Since there is no valid I²C ID table provided, there is no possibility to bind a device to this driver via user space. Hence, drop unneeded NULL check of adev.
---
v2: no changes
drivers/hid/i2c-hid/i2c-hid-acpi.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/hid/i2c-hid/i2c-hid-acpi.c +5 -11
@@ -48,8 +48,9 @@ static guid_t i2c_hid_guid =GUID_INIT (0x3CDFF6F7 ,0x4267 ,0x4555 ,0xAD ,0x05 ,0xB3 ,0x0A ,0x3D ,0x89 ,0x38 ,0xDE ); -static int i2c_hid_acpi_get_descriptor (struct acpi_device *adev) +static int i2c_hid_acpi_get_descriptor (struct i2c_hid_acpi *ihid_acpi) { +struct acpi_device *adev = ihid_acpi->adev;acpi_handle handle =acpi_device_handle (adev);union acpi_object *obj;u16 hid_descriptor_address;
@@ -81,29 +82,22 @@ static int i2c_hid_acpi_probe(struct i2c_client *client) {struct device *dev = &client->dev;struct i2c_hid_acpi *ihid_acpi; -struct acpi_device *adev;u16 hid_descriptor_address;int ret; - adev =ACPI_COMPANION (dev); -if (!adev) { -dev_err (&client->dev,"Error could not get ACPI device\n" ); -return -ENODEV ; - } - ihid_acpi =devm_kzalloc (&client->dev,sizeof (*ihid_acpi),GFP_KERNEL );if (!ihid_acpi)return -ENOMEM ; - ihid_acpi->adev = adev; + ihid_acpi->adev =ACPI_COMPANION (dev); ihid_acpi->ops.shutdown_tail = i2c_hid_acpi_shutdown_tail; - ret =i2c_hid_acpi_get_descriptor (adev); + ret =i2c_hid_acpi_get_descriptor (ihid_acpi);if (ret <0 )return ret; hid_descriptor_address = ret; -acpi_device_fix_up_power (adev); +acpi_device_fix_up_power (ihid_acpi->adev);return i2c_hid_core_probe (client, &ihid_acpi->ops, hid_descriptor_address,0 );
Signature · 1 line
2.39.0
PATCH v2 2/2 HID: i2c-hid: acpi: Unify ACPI ID tables format
Unify ACPI ID tables format by:
- surrounding HID by spaces
- dropping unnecessary driver_data assignment to 0
- dropping comma at the terminator entry
---
v2: no changes
drivers/hid/i2c-hid/i2c-hid-acpi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/hid/i2c-hid/i2c-hid-acpi.c +5 -5
@@ -39,8 +39,8 @@ static const struct acpi_device_id i2c_hid_acpi_blacklist[] = {* The CHPN0001 ACPI device, which is used to describe the Chipone * ICN8505 controller, has a _CID of PNP0C50 but is not HID compatible. */ - {"CHPN0001", 0 }, - { }, + { "CHPN0001" }, + { } };/* HID I²C Device: 3cdff6f7-4267-4555-ad05-b30a3d8938de */
@@ -104,9 +104,9 @@ static int i2c_hid_acpi_probe(struct i2c_client *client) }static const struct acpi_device_id i2c_hid_acpi_match[] = { - {"ACPI0C50" ,0 }, - {"PNP0C50" ,0 }, - { }, + {"ACPI0C50" }, + {"PNP0C50" }, + { } };MODULE_DEVICE_TABLE (acpi, i2c_hid_acpi_match);
Signature · 1 line
2.39.0
Quoted 6 lines · Andy Shevchenko
The driver is enumerated on ACPI platforms, so adev is valid. Since there is no valid I²C ID table provided, there is no possibility to bind a device to this driver via user space. Hence, drop unneeded NULL check of adev.
Signed-off-by Andy Shevchenko <[email protected]>
Applied both to hid.git#for-6.3/i2c-hid. Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs
Quoted 10 lines · Jiri Kosina
Quoted 6 lines · Andy Shevchenko
The driver is enumerated on ACPI platforms, so adev is valid. Since there is no valid I²C ID table provided, there is no possibility to bind a device to this driver via user space. Hence, drop unneeded NULL check of adev.
Signed-off-by Andy Shevchenko <[email protected]>Applied both to hid.git#for-6.3/i2c-hid. Thanks,
Thank you and HNY!
Signature · 2 lines
With Best Regards, Andy Shevchenko