| Message ID | 1490403540-31425-2-git-send-email-nick@shmanahar.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Mar 24, 2017 at 5:58 PM, Nick Dyer <nick@shmanahar.org> wrote: > When IRQ handling was moved to rmi_driver in 3aeed5b the naming of the > interrupt changed from "rmi4_i2c" to "2-0020" (or similar). This patch restores > the previous behaviour and makes the interrupt easier to identify in > /proc/interrupts. > > Signed-off-by: Nick Dyer <nick@shmanahar.org> > --- > drivers/input/rmi4/rmi_driver.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c > index d64fc92..5b7350f 100644 > --- a/drivers/input/rmi4/rmi_driver.c > +++ b/drivers/input/rmi4/rmi_driver.c > @@ -251,7 +251,7 @@ static int rmi_irq_init(struct rmi_device *rmi_dev) > > ret = devm_request_threaded_irq(&rmi_dev->dev, pdata->irq, NULL, > rmi_irq_fn, irq_flags | IRQF_ONESHOT, > - dev_name(rmi_dev->xport->dev), > + dev_driver_string(rmi_dev->xport->dev), > rmi_dev); > if (ret < 0) { > dev_err(&rmi_dev->dev, "Failed to register interrupt %d\n", > -- > 2.7.4 > Tested with both S7300 and S7817 HW. Tested-by: Chris Healy <cphealy@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index d64fc92..5b7350f 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -251,7 +251,7 @@ static int rmi_irq_init(struct rmi_device *rmi_dev) ret = devm_request_threaded_irq(&rmi_dev->dev, pdata->irq, NULL, rmi_irq_fn, irq_flags | IRQF_ONESHOT, - dev_name(rmi_dev->xport->dev), + dev_driver_string(rmi_dev->xport->dev), rmi_dev); if (ret < 0) { dev_err(&rmi_dev->dev, "Failed to register interrupt %d\n",
When IRQ handling was moved to rmi_driver in 3aeed5b the naming of the interrupt changed from "rmi4_i2c" to "2-0020" (or similar). This patch restores the previous behaviour and makes the interrupt easier to identify in /proc/interrupts. Signed-off-by: Nick Dyer <nick@shmanahar.org> --- drivers/input/rmi4/rmi_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)