[PATCH v2 3/6] platform/x86: dell-smo8800: Pass the IRQ to the lis3lv02d i2c_client

Hans de Goede
2024-01-06T16:09:52Z

When a lis3lv02d i2c_client has been instantiated pass the IRQ to
the i2c_client and let the lis3lv02d driver take care of registering
/dev/freefall and handling the IRQ.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/platform/x86/dell/dell-smo8800.c | 40 ++++++++++++++----------
1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/drivers/platform/x86/dell/dell-smo8800.c b/drivers/platform/x86/dell/dell-smo8800.c
index c674e3392270..3e64ebcf4b21 100644
--- a/drivers/platform/x86/dell/dell-smo8800.c
+++ b/drivers/platform/x86/dell/dell-smo8800.c
@@ -199,6 +199,7 @@ static void smo8800_instantiate_i2c_client(struct smo8800_device *smo8800)
}

info.addr = addr;
+ info.irq = smo8800->irq;
strscpy(info.type, "lis3lv02d", I2C_NAME_SIZE);

smo8800->i2c_dev = i2c_new_client_device(adap, &info);
@@ -239,21 +240,24 @@ static int smo8800_probe(struct platform_device *device)

smo8800_instantiate_i2c_client(smo8800);

- err = misc_register(&smo8800->miscdev);
- if (err) {
- dev_err(&device->dev, "failed to register misc dev: %d\n", err);
- goto error_unregister_i2c_client;
- }
+ /* smo8800->irq is passed to the i2c_client and its driver will take care of this */
+ if (!smo8800->i2c_dev) {
+ err = misc_register(&smo8800->miscdev);
+ if (err) {
+ dev_err(&device->dev, "failed to register misc dev: %d\n", err);
+ goto error_unregister_i2c_client;
+ }

- err = request_threaded_irq(smo8800->irq, smo8800_interrupt_quick,
- smo8800_interrupt_thread,
- IRQF_TRIGGER_RISING | IRQF_ONESHOT,
- DRIVER_NAME, smo8800);
- if (err) {
- dev_err(&device->dev,
- "failed to request thread for IRQ %d: %d\n",
- smo8800->irq, err);
- goto error;
+ err = request_threaded_irq(smo8800->irq, smo8800_interrupt_quick,
+ smo8800_interrupt_thread,
+ IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+ DRIVER_NAME, smo8800);
+ if (err) {
+ dev_err(&device->dev,
+ "failed to request thread for IRQ %d: %d\n",
+ smo8800->irq, err);
+ goto error;
+ }
}

dev_dbg(&device->dev, "device /dev/freefall registered with IRQ %d\n",
@@ -272,9 +276,11 @@ static void smo8800_remove(struct platform_device *device)
{
struct smo8800_device *smo8800 = platform_get_drvdata(device);

- free_irq(smo8800->irq, smo8800);
- misc_deregister(&smo8800->miscdev);
- dev_dbg(&device->dev, "device /dev/freefall unregistered\n");
+ if (!smo8800->i2c_dev) {
+ free_irq(smo8800->irq, smo8800);
+ misc_deregister(&smo8800->miscdev);
+ dev_dbg(&device->dev, "device /dev/freefall unregistered\n");
+ }
i2c_unregister_device(smo8800->i2c_dev);
}

--
2.43.0