Skip to contentSkip to conversation

staging: usbip: replace pr_warning() with dev_warn().

PATCH Superseded navin patidar 2 participants 2 messages Jun 26, 2013 Staging

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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 |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/staging/usbip/usbip_event.c +13 -1
index 82123be..3bd1b94 100644
@@ -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,17 @@ 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

#1 lore raw

Hello.

Quoted 24 lines · navin patidar

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 |   14 +++++++++++++-
  1 file changed, 13 insertions(+), 1 deletion(-)
drivers/staging/usbip/usbip_event.c +2 -0
index 82123be..3bd1b94 100644
@@ -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)
  {

drivers/staging/usbip/usbip_event.c int usbip_start_eh(struct usbip_device *ud) · line 90

Quoted 5 lines
drivers/staging/usbip/usbip_event.c +1 -1
@@ -85,7 +87,17 @@ 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;

Empty line after declaration wouldn't hurt here...

drivers/staging/usbip/usbip_event.c int usbip_start_eh(struct usbip_device *ud) · line 92

Quoted 2 lines
drivers/staging/usbip/usbip_event.c +2 -0
+		if (ud->side == USBIP_STUB) {
+			struct stub_device *sdev;

... and here.

drivers/staging/usbip/usbip_event.c int usbip_start_eh(struct usbip_device *ud) · line 96

Quoted 4 lines
drivers/staging/usbip/usbip_event.c +4 -0
+			sdev = container_of(ud, struct stub_device, ud);
+			dev = sdev->udev->dev;
+		} else {
+			struct vhci_device *vdev;

... and here.

drivers/staging/usbip/usbip_event.c int usbip_start_eh(struct usbip_device *ud) · line 100

Quoted 4 lines
drivers/staging/usbip/usbip_event.c +4 -0
+			vdev = container_of(ud, struct vhci_device, ud);
+			dev = vdev->udev->dev;
+		}
+		dev_warn(&dev, "Unable to start control thread\n");

Patch looks clumsy...

WBR, Sergei