tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
USB: input: kbtab.c: fix up dev_* messages
Previously I had made the struct device point to the input device, but
after talking with Dmitry, he said that the USB device would make more
sense for this driver to point to. So converted it to use that instead.
CC: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+7
-3
+7
-3
drivers/input/tablet/kbtab.c
+7
-3
drivers/input/tablet/kbtab.c
···
33
33
dma_addr_t data_dma;
34
34
struct input_dev *dev;
35
35
struct usb_device *usbdev;
36
+
struct usb_interface *intf;
36
37
struct urb *irq;
37
38
char phys[32];
38
39
};
···
54
53
case -ENOENT:
55
54
case -ESHUTDOWN:
56
55
/* this urb is terminated, clean up */
57
-
dev_dbg(&dev->dev, "%s - urb shutting down with status: %d\n",
56
+
dev_dbg(&kbtab->intf->dev,
57
+
"%s - urb shutting down with status: %d\n",
58
58
__func__, urb->status);
59
59
return;
60
60
default:
61
-
dev_dbg(&dev->dev, "%s - nonzero urb status received: %d\n",
61
+
dev_dbg(&kbtab->intf->dev,
62
+
"%s - nonzero urb status received: %d\n",
62
63
__func__, urb->status);
63
64
goto exit;
64
65
}
···
85
82
exit:
86
83
retval = usb_submit_urb(urb, GFP_ATOMIC);
87
84
if (retval)
88
-
dev_err(&dev->dev,
85
+
dev_err(&kbtab->intf->dev,
89
86
"%s - usb_submit_urb failed with result %d\n",
90
87
__func__, retval);
91
88
}
···
137
134
goto fail2;
138
135
139
136
kbtab->usbdev = dev;
137
+
kbtab->intf = intf;
140
138
kbtab->dev = input_dev;
141
139
142
140
usb_make_path(dev, kbtab->phys, sizeof(kbtab->phys));