[OPW,kernel] Staging: xillybus: joining split strings across lines
diff mbox

Message ID 20131015155811.GA14245@Ashvini
State Rejected
Headers show

Commit Message

Ashvini Varatharaj Oct. 15, 2013, 3:58 p.m. UTC
Fix checkpatch warning: quoted strings split across lines

Signed-off-by: Ashvini Varatharaj <ashvinivaratharaj@gmail.com>
---
 drivers/staging/xillybus/xillybus_of.c   |    8 ++++----
 drivers/staging/xillybus/xillybus_pcie.c |   24 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

Comments

Greg KH Oct. 15, 2013, 4:28 p.m. UTC | #1
On Tue, Oct 15, 2013 at 09:28:11PM +0530, Ashvini Varatharaj wrote:
> Fix checkpatch warning: quoted strings split across lines
> 
> Signed-off-by: Ashvini Varatharaj <ashvinivaratharaj@gmail.com>
> ---
>  drivers/staging/xillybus/xillybus_of.c   |    8 ++++----
>  drivers/staging/xillybus/xillybus_pcie.c |   24 ++++++++++++------------
>  2 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/staging/xillybus/xillybus_of.c b/drivers/staging/xillybus/xillybus_of.c
> index 2ae045e..77a5769 100644
> --- a/drivers/staging/xillybus/xillybus_of.c
> +++ b/drivers/staging/xillybus/xillybus_of.c
> @@ -117,8 +117,8 @@ 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 isn't correct, you just added a bunch of whitespace to the string
without meaning to :(

greg k-h
Ashvini Varatharaj Oct. 15, 2013, 4:44 p.m. UTC | #2
Sorry :( I will build them .Extremely sorry for the trouble.:(


*Ashvini Varatharaj *



On Tue, Oct 15, 2013 at 9:58 PM, Greg KH <gregkh@linuxfoundation.org> wrote:

> On Tue, Oct 15, 2013 at 09:28:11PM +0530, Ashvini Varatharaj wrote:
> > Fix checkpatch warning: quoted strings split across lines
> >
> > Signed-off-by: Ashvini Varatharaj <ashvinivaratharaj@gmail.com>
> > ---
> >  drivers/staging/xillybus/xillybus_of.c   |    8 ++++----
> >  drivers/staging/xillybus/xillybus_pcie.c |   24 ++++++++++++------------
> >  2 files changed, 16 insertions(+), 16 deletions(-)
> >
> > diff --git a/drivers/staging/xillybus/xillybus_of.c
> b/drivers/staging/xillybus/xillybus_of.c
> > index 2ae045e..77a5769 100644
> > --- a/drivers/staging/xillybus/xillybus_of.c
> > +++ b/drivers/staging/xillybus/xillybus_of.c
> > @@ -117,8 +117,8 @@ 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 isn't correct, you just added a bunch of whitespace to the string
> without meaning to :(
>
> greg k-h
>

Patch
diff mbox

diff --git a/drivers/staging/xillybus/xillybus_of.c b/drivers/staging/xillybus/xillybus_of.c
index 2ae045e..77a5769 100644
--- a/drivers/staging/xillybus/xillybus_of.c
+++ b/drivers/staging/xillybus/xillybus_of.c
@@ -117,8 +117,8 @@  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 +141,8 @@  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;
 	}
diff --git a/drivers/staging/xillybus/xillybus_pcie.c b/drivers/staging/xillybus/xillybus_pcie.c
index 6701365..f467abc 100644
--- a/drivers/staging/xillybus/xillybus_pcie.c
+++ b/drivers/staging/xillybus/xillybus_pcie.c
@@ -148,22 +148,22 @@  static int xilly_probe(struct pci_dev *pdev,
 	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S);
 
 	if (rc) {
-		pr_err("xillybus: pci_enable_device() failed. "
-		       "Aborting.\n");
+		pr_err("xillybus: pci_enable_device() failed.
+					Aborting.\n");
 		goto no_enable;
 	}
 
 	if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
-		pr_err("xillybus: Incorrect BAR configuration. "
-		       "Aborting.\n");
+		pr_err("xillybus: Incorrect BAR configuration.
+					Aborting.\n");
 		rc = -ENODEV;
 		goto bad_bar;
 	}
 
 	rc = pci_request_regions(pdev, xillyname);
 	if (rc) {
-		pr_err("xillybus: pci_request_regions() failed. "
-		       "Aborting.\n");
+		pr_err("xillybus: pci_request_regions() failed.
+					Aborting.\n");
 		goto failed_request_regions;
 	}
 
@@ -178,16 +178,16 @@  static int xilly_probe(struct pci_dev *pdev,
 
 	/* Set up a single MSI interrupt */
 	if (pci_enable_msi(pdev)) {
-		pr_err("xillybus: Failed to enable MSI interrupts. "
-		       "Aborting.\n");
+		pr_err("xillybus: Failed to enable MSI interrupts.
+						Aborting.\n");
 		rc = -ENODEV;
 		goto failed_enable_msi;
 	}
 	rc = request_irq(pdev->irq, xillybus_isr, 0, xillyname, endpoint);
 
 	if (rc) {
-		pr_err("xillybus: Failed to register MSI handler. "
-		       "Aborting.\n");
+		pr_err("xillybus: Failed to register MSI handler.
+					Aborting.\n");
 		rc = -ENODEV;
 		goto failed_register_msi;
 	}
@@ -202,8 +202,8 @@  static int xilly_probe(struct pci_dev *pdev,
 	if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))
 		endpoint->dma_using_dac = 0;
 	else {
-		pr_err("xillybus: Failed to set DMA mask. "
-		       "Aborting.\n");
+		pr_err("xillybus: Failed to set DMA mask.
+					Aborting.\n");
 		rc = -ENODEV;
 		goto failed_dmamask;
 	}