staging: usbip: replace pr_warning() with dev_warn().
PATCH v3 1/1 staging: usbip: replace pr_warning() with dev_warn().
dev_warn() is preferred over pr_warning().
container_of() is used to get usb_driver pointer from usbip_device container (stub_device or vhci_device), to get device structure required for dev_warn().
--- drivers/staging/usbip/usbip_event.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/staging/usbip/usbip_event.c +16 -1
@@ -21,6 +21,8 @@#include <linux/export.h> #include "usbip_common.h" +#include "stub.h" +#include "vhci.h" static int event_handler (struct usbip_device *ud) {
@@ -85,7 +87,20 @@ int usbip_start_eh(struct usbip_device *ud) ud->eh =kthread_run (event_handler_loop, ud,"usbip_eh" );if (IS_ERR (ud->eh)) { -pr_warning ("Unable to start control thread\n" ); +struct device dev; + +if (ud->side ==USBIP_STUB ) { +struct stub_device *sdev; + + sdev = container_of(ud, struct stub_device, ud); + dev = sdev->udev->dev; + }else { +struct vhci_device *vdev; + + vdev = container_of(ud, struct vhci_device, ud); + dev = vdev->udev->dev; + } +dev_warn (&dev,"Unable to start control thread\n" );return PTR_ERR (ud->eh); }
--
1.7.10.4
Quoted 1 line · navin patidar
dev_warn()is preferred overpr_warning().
[]
drivers/staging/usbip/usbip_event.c
Quoted 1 line
drivers/staging/usbip/usbip_event.c +0
-0
[]
drivers/staging/usbip/usbip_event.c int usbip_start_eh(struct usbip_device *ud) · line 90
Quoted 6 lines
drivers/staging/usbip/usbip_event.c +1
-1@@ -85,7 +87,20 @@ int usbip_start_eh(struct usbip_device *ud) ud->eh =kthread_run (event_handler_loop, ud,"usbip_eh" );if (IS_ERR (ud->eh)) { -pr_warning ("Unable to start control thread\n" ); +struct device dev;
Don't put a struct device on stack,
just use a struct device *
drivers/staging/usbip/usbip_event.c int usbip_start_eh(struct usbip_device *ud) · line 96
Quoted 5 lines
drivers/staging/usbip/usbip_event.c +5
-0+if (ud->side ==USBIP_STUB ) { +struct stub_device *sdev; + + sdev = container_of(ud, struct stub_device, ud); + dev = sdev->udev->dev;
dev = &sdev->udev->dev;
drivers/staging/usbip/usbip_event.c int usbip_start_eh(struct usbip_device *ud) · line 101
Quoted 5 lines
drivers/staging/usbip/usbip_event.c +5
-0+ }else { +struct vhci_device *vdev; + + vdev = container_of(ud, struct vhci_device, ud); + dev = vdev->udev->dev;
dev = &vdev->udev->dev; though maybe dev = &container_of(udev, struct vhci_device, ud)->udev->dev;
would work too.
drivers/staging/usbip/usbip_event.c int usbip_start_eh(struct usbip_device *ud) · line 103
Quoted 2 lines
drivers/staging/usbip/usbip_event.c +2
-0+ } +dev_warn (&dev,"Unable to start control thread\n" );
dev_warn(dev, ...)