[OPW,kernel,v2,2/2] staging:go7007:Replace KERN_ERR with pr_err
diff mbox

Message ID 01fa7480e2faaed66c4ad887663cc8d888bbf4f5.1381299663.git.dulshani.gunawardhana89@gmail.com
State Accepted
Headers show

Commit Message

Dulshani Gunawardhana Oct. 9, 2013, 6:28 a.m. UTC
Replace KERN_ERR with pr_err in go7007-usb.c

Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
---
 drivers/staging/media/go7007/go7007-usb.c | 52 +++++++++++++------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

Comments

Greg Kroah-Hartman Oct. 11, 2013, 8:30 p.m. UTC | #1
On Wed, Oct 09, 2013 at 11:58:54AM +0530, Dulshani Gunawardhana wrote:
> Replace KERN_ERR with pr_err in go7007-usb.c
> 
> Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
> ---
>  drivers/staging/media/go7007/go7007-usb.c | 52 +++++++++++++------------------
>  1 file changed, 21 insertions(+), 31 deletions(-)
> 
> diff --git a/drivers/staging/media/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c
> index 5ea50da..23529f6 100644
> --- a/drivers/staging/media/go7007/go7007-usb.c
> +++ b/drivers/staging/media/go7007/go7007-usb.c
> @@ -677,8 +677,7 @@ static int go7007_usb_interface_reset(struct go7007 *go)
>  	/* Wait for an interrupt to indicate successful hardware reset */
>  	if (go7007_read_interrupt(go, &intr_val, &intr_data) < 0 ||
>  			(intr_val & ~0x1) != 0x55aa) {
> -		printk(KERN_ERR
> -			"go7007-usb: unable to reset the USB interface\n");
> +		pr_err("unable to reset the USB interface\n");

I'll take this for now, but in the future, you really should be using
the dev_err() calls here, wherever possible.  As this is a driver, there
should not be any printk(), or pr_*() calls, only dev_*() calls, as you
almost always have access to the 'struct device' that the driver is
controlling.

So in the future, if you want to convert these pr_err() calls to
dev_err(), that would be great.  Same for the other pr_* calls in the
driver (like you added in a later patch for pr_info()).

thanks

greg k-h
Greg Kroah-Hartman Oct. 11, 2013, 8:35 p.m. UTC | #2
On Wed, Oct 09, 2013 at 11:58:54AM +0530, Dulshani Gunawardhana wrote:
> Replace KERN_ERR with pr_err in go7007-usb.c
> 
> Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>

Applied, thanks.

greg k-h
Dulshani Gunawardhana Oct. 15, 2013, 3:41 p.m. UTC | #3
Ok will get onto it :)
Thanks for the feedback Greg.


I'll take this for now, but in the future, you really should be using 
> the dev_err() calls here, wherever possible.  As this is a driver, there 
> should not be any printk(), or pr_*() calls, only dev_*() calls, as you 
> almost always have access to the 'struct device' that the driver is 
> controlling. 
>
> So in the future, if you want to convert these pr_err() calls to 
> dev_err(), that would be great.  Same for the other pr_* calls in the 
> driver (like you added in a later patch for pr_info()). 
>
> thanks 
>
> greg k-h 
>
Dulshani Gunawardhana Oct. 20, 2013, 12:36 p.m. UTC | #4
Hi,

I've been attempting this fix, but am really stuck. My issue is with the 
argument to pass as the driver for the dev_*( ) calls here. I've looked at 
some previous patches but am still struggling with grasping the logic. 

I'd be really grateful for some guidance on this :(. 
  

>
>
> I'll take this for now, but in the future, you really should be using 
>> the dev_err() calls here, wherever possible.  As this is a driver, there 
>> should not be any printk(), or pr_*() calls, only dev_*() calls, as you 
>> almost always have access to the 'struct device' that the driver is 
>> controlling. 
>>
>> So in the future, if you want to convert these pr_err() calls to 
>> dev_err(), that would be great.  Same for the other pr_* calls in the 
>> driver (like you added in a later patch for pr_info()). 
>>
>> thanks 
>>
>> greg k-h 
>>
>
Greg KH Oct. 21, 2013, 3:53 a.m. UTC | #5
On Sun, Oct 20, 2013 at 05:36:20AM -0700, Dulshani Gunawardhana wrote:
>  Hi,
> 
> I've been attempting this fix, but am really stuck. My issue is with the
> argument to pass as the driver for the dev_*( ) calls here. I've looked at some
> previous patches but am still struggling with grasping the logic. 
> 
> I'd be really grateful for some guidance on this :(. 

You have to "find" the 'struct device' that the driver is using at that
point in time in the code.  Usually it's burried in a pci device, or
usb device or something else that the driver saves off as a "local"
device structure.

Each driver is different on how to find this, there's no magic way to do
it for all of them, sorry.

greg k-h
Dulshani Gunawardhana Oct. 21, 2013, 7:42 a.m. UTC | #6
I figured it out and resubmitted as V3 :)

Thanks :)

Patch
diff mbox

diff --git a/drivers/staging/media/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c
index 5ea50da..23529f6 100644
--- a/drivers/staging/media/go7007/go7007-usb.c
+++ b/drivers/staging/media/go7007/go7007-usb.c
@@ -677,8 +677,7 @@  static int go7007_usb_interface_reset(struct go7007 *go)
 	/* Wait for an interrupt to indicate successful hardware reset */
 	if (go7007_read_interrupt(go, &intr_val, &intr_data) < 0 ||
 			(intr_val & ~0x1) != 0x55aa) {
-		printk(KERN_ERR
-			"go7007-usb: unable to reset the USB interface\n");
+		pr_err("unable to reset the USB interface\n");
 		return -1;
 	}
 	return 0;
@@ -710,9 +709,7 @@  static int go7007_usb_ezusb_write_interrupt(struct go7007 *go,
 	if (r < 0)
 		goto write_int_error;
 	if (i == 100) {
-		printk(KERN_ERR
-			"go7007-usb: device is hung, status reg = 0x%04x\n",
-			status_reg);
+		pr_err("device is hung, status reg = 0x%04x\n", status_reg);
 		return -1;
 	}
 	r = usb_control_msg(usb->usbdev, usb_sndctrlpipe(usb->usbdev, 0), 0x12,
@@ -728,7 +725,7 @@  static int go7007_usb_ezusb_write_interrupt(struct go7007 *go,
 	return 0;
 
 write_int_error:
-	printk(KERN_ERR "go7007-usb: error in WriteInterrupt: %d\n", r);
+	pr_err("error in WriteInterrupt: %d\n", r);
 	return r;
 }
 
@@ -750,7 +747,7 @@  static int go7007_usb_onboard_write_interrupt(struct go7007 *go,
 			USB_TYPE_VENDOR | USB_RECIP_ENDPOINT, 0x55aa,
 			0xf0f0, go->usb_buf, 8, timeout);
 	if (r < 0) {
-		printk(KERN_ERR "go7007-usb: error in WriteInterrupt: %d\n", r);
+		pr_err("error in WriteInterrupt: %d\n", r);
 		return r;
 	}
 	return 0;
@@ -765,15 +762,13 @@  static void go7007_usb_readinterrupt_complete(struct urb *urb)
 	if (status) {
 		if (status != -ESHUTDOWN &&
 				go->status != STATUS_SHUTDOWN) {
-			printk(KERN_ERR
-				"go7007-usb: error in read interrupt: %d\n",
-				urb->status);
+			pr_err("error in read interrupt: %d\n", urb->status);
 		} else {
 			wake_up(&go->interrupt_waitq);
 			return;
 		}
 	} else if (urb->actual_length != urb->transfer_buffer_length) {
-		printk(KERN_ERR "go7007-usb: short read in interrupt pipe!\n");
+		pr_err("short read in interrupt pipe!\n");
 	} else {
 		go->interrupt_available = 1;
 		go->interrupt_data = __le16_to_cpu(regs[0]);
@@ -792,8 +787,7 @@  static int go7007_usb_read_interrupt(struct go7007 *go)
 
 	r = usb_submit_urb(usb->intr_urb, GFP_KERNEL);
 	if (r < 0) {
-		printk(KERN_ERR
-			"go7007-usb: unable to submit interrupt urb: %d\n", r);
+		pr_err("unable to submit interrupt urb: %d\n", r);
 		return r;
 	}
 	return 0;
@@ -809,18 +803,17 @@  static void go7007_usb_read_video_pipe_complete(struct urb *urb)
 		return;
 	}
 	if (status) {
-		printk(KERN_ERR "go7007-usb: error in video pipe: %d\n",
-			status);
+		pr_err("error in video pipe: %d\n", status);
 		return;
 	}
 	if (urb->actual_length != urb->transfer_buffer_length) {
-		printk(KERN_ERR "go7007-usb: short read in video pipe!\n");
+		pr_err("short read in video pipe!\n");
 		return;
 	}
 	go7007_parse_video_stream(go, urb->transfer_buffer, urb->actual_length);
 	r = usb_submit_urb(urb, GFP_ATOMIC);
 	if (r < 0)
-		printk(KERN_ERR "go7007-usb: error in video pipe: %d\n", r);
+		pr_err("error in video pipe: %d\n", r);
 }
 
 static void go7007_usb_read_audio_pipe_complete(struct urb *urb)
@@ -831,19 +824,19 @@  static void go7007_usb_read_audio_pipe_complete(struct urb *urb)
 	if (!vb2_is_streaming(&go->vidq))
 		return;
 	if (status) {
-		printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n",
+		pr_err("error in audio pipe: %d\n",
 			status);
 		return;
 	}
 	if (urb->actual_length != urb->transfer_buffer_length) {
-		printk(KERN_ERR "go7007-usb: short read in audio pipe!\n");
+		pr_err("short read in audio pipe!\n");
 		return;
 	}
 	if (go->audio_deliver != NULL)
 		go->audio_deliver(go, urb->transfer_buffer, urb->actual_length);
 	r = usb_submit_urb(urb, GFP_ATOMIC);
 	if (r < 0)
-		printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n", r);
+		pr_err("error in audio pipe: %d\n", r);
 }
 
 static int go7007_usb_stream_start(struct go7007 *go)
@@ -854,8 +847,7 @@  static int go7007_usb_stream_start(struct go7007 *go)
 	for (i = 0; i < 8; ++i) {
 		r = usb_submit_urb(usb->video_urbs[i], GFP_KERNEL);
 		if (r < 0) {
-			printk(KERN_ERR "go7007-usb: error submitting video "
-					"urb %d: %d\n", i, r);
+			pr_err("error submitting video urb %d: %d\n", i, r);
 			goto video_submit_failed;
 		}
 	}
@@ -865,8 +857,7 @@  static int go7007_usb_stream_start(struct go7007 *go)
 	for (i = 0; i < 8; ++i) {
 		r = usb_submit_urb(usb->audio_urbs[i], GFP_KERNEL);
 		if (r < 0) {
-			printk(KERN_ERR "go7007-usb: error submitting audio "
-					"urb %d: %d\n", i, r);
+			pr_err("error submitting audio urb %d: %d\n", i, r);
 			goto audio_submit_failed;
 		}
 	}
@@ -1111,7 +1102,7 @@  static int go7007_usb_probe(struct usb_interface *intf,
 		board = &board_px_tv402u;
 		break;
 	case GO7007_BOARDID_LIFEVIEW_LR192:
-		printk(KERN_ERR "go7007-usb: The Lifeview TV Walker Ultra "
+		pr_err("The Lifeview TV Walker Ultra "
 				"is not supported.  Sorry!\n");
 		return -ENODEV;
 		name = "Lifeview TV Walker Ultra";
@@ -1127,7 +1118,7 @@  static int go7007_usb_probe(struct usb_interface *intf,
 		board = &board_ads_usbav_709;
 		break;
 	default:
-		printk(KERN_ERR "go7007-usb: unknown board ID %d!\n",
+		pr_err("unknown board ID %d!\n",
 				(unsigned int)id->driver_info);
 		return -ENODEV;
 	}
@@ -1186,8 +1177,7 @@  static int go7007_usb_probe(struct usb_interface *intf,
 		go->i2c_adapter.dev.parent = go->dev;
 		i2c_set_adapdata(&go->i2c_adapter, go);
 		if (i2c_add_adapter(&go->i2c_adapter) < 0) {
-			printk(KERN_ERR
-				"go7007-usb: error: i2c_add_adapter failed\n");
+			pr_err("error: i2c_add_adapter failed\n");
 			goto allocfail;
 		}
 		go->i2c_adapter_online = 1;
@@ -1238,7 +1228,7 @@  static int go7007_usb_probe(struct usb_interface *intf,
 	if (go->board_id == GO7007_BOARDID_PX_TV402U) {
 		/* Board strapping indicates tuner model */
 		if (go7007_usb_vendor_request(go, 0x41, 0, 0, go->usb_buf, 3, 1) < 0) {
-			printk(KERN_ERR "go7007-usb: GPIO read failed!\n");
+			pr_err("GPIO read failed!\n");
 			goto allocfail;
 		}
 		switch (go->usb_buf[0] >> 6) {
@@ -1270,7 +1260,7 @@  static int go7007_usb_probe(struct usb_interface *intf,
 		 * to the EZ-USB GPIO output pins */
 		if (go7007_usb_vendor_request(go, 0x40, 0x7f02, 0,
 					NULL, 0, 0) < 0) {
-			printk(KERN_ERR "go7007-usb: GPIO write failed!\n");
+			pr_err("GPIO write failed!\n");
 			goto allocfail;
 		}
 	}
@@ -1279,7 +1269,7 @@  static int go7007_usb_probe(struct usb_interface *intf,
 	 * a USB1.1 port.  There will be silent corruption of the stream. */
 	if ((board->flags & GO7007_USB_EZUSB) &&
 			usbdev->speed != USB_SPEED_HIGH)
-		printk(KERN_ERR "go7007-usb: *** WARNING ***  This device "
+		pr_err("*** WARNING ***  This device "
 				"must be connected to a USB 2.0 port!  "
 				"Attempting to capture video through a USB 1.1 "
 				"port will result in stream corruption, even "