2013-10-16 17:58:09

by Dhanunjaya Naidu Ravada

[permalink] [raw]
Subject: [PATCH 2/2] Staging: xillybus: fix for quoted string split across lines

This is a patch to the xillybus_of.c file that fixes up a
quoted string split across lines warning found by the
checkpatch.pl tool.

Signed-off-by: Dhanunjaya <[email protected]>
---
drivers/staging/xillybus/xillybus_of.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/xillybus/xillybus_of.c b/drivers/staging/xillybus/xillybus_of.c
index 92c2931..822ef4d 100644
--- a/drivers/staging/xillybus/xillybus_of.c
+++ b/drivers/staging/xillybus/xillybus_of.c
@@ -117,8 +117,7 @@ static int xilly_drv_probe(struct platform_device *op)

rc = of_address_to_resource(dev->of_node, 0, &endpoint->res);
if (rc) {
- pr_warn("xillybus: Failed to obtain device tree "
- "resource\n");
+ pr_warn("xillybus: Failed to obtain device tree resource\n");
goto failed_request_regions;
}

@@ -141,8 +140,7 @@ static int xilly_drv_probe(struct platform_device *op)
rc = request_irq(irq, xillybus_isr, 0, xillyname, endpoint);

if (rc) {
- pr_err("xillybus: Failed to register IRQ handler. "
- "Aborting.\n");
+ pr_err("xillybus: Failed to register IRQ handler, Aborting...\n");
rc = -ENODEV;
goto failed_register_irq;
}
--
1.8.1.2


2013-10-16 18:06:29

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH 2/2] Staging: xillybus: fix for quoted string split across lines

On Wed, Oct 16, 2013 at 11:27:52PM +0530, Dhanunjaya wrote:
> This is a patch to the xillybus_of.c file that fixes up a
> quoted string split across lines warning found by the
> checkpatch.pl tool.
>
> Signed-off-by: Dhanunjaya <[email protected]>

I need a full name here please.

> ---
> drivers/staging/xillybus/xillybus_of.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/xillybus/xillybus_of.c b/drivers/staging/xillybus/xillybus_of.c
> index 92c2931..822ef4d 100644
> --- a/drivers/staging/xillybus/xillybus_of.c
> +++ b/drivers/staging/xillybus/xillybus_of.c
> @@ -117,8 +117,7 @@ static int xilly_drv_probe(struct platform_device *op)
>
> rc = of_address_to_resource(dev->of_node, 0, &endpoint->res);
> if (rc) {
> - pr_warn("xillybus: Failed to obtain device tree "
> - "resource\n");
> + pr_warn("xillybus: Failed to obtain device tree resource\n");

This should be using dev_warn() instead.

> goto failed_request_regions;
> }
>
> @@ -141,8 +140,7 @@ static int xilly_drv_probe(struct platform_device *op)
> rc = request_irq(irq, xillybus_isr, 0, xillyname, endpoint);
>
> if (rc) {
> - pr_err("xillybus: Failed to register IRQ handler. "
> - "Aborting.\n");
> + pr_err("xillybus: Failed to register IRQ handler, Aborting...\n");

dev_err() instead please here as well.

thanks,

greg k-h

2013-10-16 19:04:55

by Eli Billauer

[permalink] [raw]
Subject: Re: [PATCH 2/2] Staging: xillybus: fix for quoted string split across lines

Hello Greg,

On 16/10/13 21:06, Greg KH wrote:
>> rc = of_address_to_resource(dev->of_node, 0,&endpoint->res);
>> > if (rc) {
>> > - pr_warn("xillybus: Failed to obtain device tree "
>> > - "resource\n");
>> > + pr_warn("xillybus: Failed to obtain device tree resource\n");
>>
> This should be using dev_warn() instead.
>
>

So I understand that I should replace *all* occurrences of pr_warn() and
pr_err() with their dev_* counterparts?

If so, please give me a week or so to handle that. It's going to be
rather chunky patch...

Regards,

Eli

2013-10-16 19:09:40

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH 2/2] Staging: xillybus: fix for quoted string split across lines

On Wed, Oct 16, 2013 at 09:49:19PM +0300, Eli Billauer wrote:
> Hello Greg,
>
> On 16/10/13 21:06, Greg KH wrote:
> >> rc = of_address_to_resource(dev->of_node, 0,&endpoint->res);
> >>> if (rc) {
> >>> - pr_warn("xillybus: Failed to obtain device tree "
> >>> - "resource\n");
> >>> + pr_warn("xillybus: Failed to obtain device tree resource\n");
> >This should be using dev_warn() instead.
> >
>
> So I understand that I should replace *all* occurrences of pr_warn()
> and pr_err() with their dev_* counterparts?

Yes.