: hid-cp2112: fix multiple gpiochips
PATCH 1/1 : hid-cp2112: fix multiple gpiochips
In lk 5.11.0-rc2 connecting a USB based Silicon Labs HID to I2C bridge evaluation board (CP2112EK) causes this warning:
gpio gpiochip0: (cp2112_gpio): detected irqchip that is shared
with multiple gpiochips: please fix the driver
Simply copy what other gpio related drivers do to fix this particular warning: replicate the struct irq_chip object in each device instance rather than have a static object which makes that object (incorrectly) shared by each device.
--- drivers/hid/hid-cp2112.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/hid/hid-cp2112.c +11 -11
@@ -161,6 +161,7 @@ struct cp2112_device {atomic_t read_avail;atomic_t xfer_avail;struct gpio_chip gc; +struct irq_chip irq;u8 *in_out_buffer;struct mutex lock;
@@ -1175,16 +1176,6 @@ static int cp2112_gpio_irq_type(struct irq_data *d, unsigned int type)return 0 ; } -static struct irq_chip cp2112_gpio_irqchip = { - .name ="cp2112-gpio" , - .irq_startup = cp2112_gpio_irq_startup, - .irq_shutdown = cp2112_gpio_irq_shutdown, - .irq_ack = cp2112_gpio_irq_ack, - .irq_mask = cp2112_gpio_irq_mask, - .irq_unmask = cp2112_gpio_irq_unmask, - .irq_set_type = cp2112_gpio_irq_type, -}; -static int __maybe_unused cp2112_allocate_irq (struct cp2112_device *dev,int pin) {
@@ -1339,8 +1330,17 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) dev->gc.can_sleep =1 ; dev->gc.parent = &hdev->dev; + dev->irq.name ="cp2112-gpio" ; + dev->irq.irq_startup = cp2112_gpio_irq_startup; + dev->irq.irq_shutdown = cp2112_gpio_irq_shutdown; + dev->irq.irq_ack = cp2112_gpio_irq_ack; + dev->irq.irq_mask = cp2112_gpio_irq_mask; + dev->irq.irq_unmask = cp2112_gpio_irq_unmask; + dev->irq.irq_set_type = cp2112_gpio_irq_type; + dev->irq.flags =IRQCHIP_MASK_ON_SUSPEND ; + girq = &dev->gc.irq; - girq->chip = &cp2112_gpio_irqchip; + girq->chip = &dev->irq;/* The event comes from the outside so no parent handler */ girq->parent_handler =NULL ; girq->num_parents =0 ;
Signature · 1 line
2.25.1
Quoted 11 lines · Douglas Gilbert
In lk 5.11.0-rc2 connecting a USB based Silicon Labs HID to I2C bridge evaluation board (CP2112EK) causes this warning:
gpio gpiochip0: (cp2112_gpio): detected irqchip that is shared
with multiple gpiochips: please fix the driverSimply copy what other gpio related drivers do to fix this particular warning: replicate the struct
irq_chipobject in each device instance rather than have a static object which makes that object (incorrectly) shared by each device.Signed-off-by Douglas Gilbert <[email protected]>
Applied, thanks for the fix, and sorry for the delay.
Signature · 2 lines
Jiri Kosina SUSE Labs