[PATCH] serial: icom: fix inconsistent indenting warning

Charles Han posted 1 patch 11 months, 1 week ago
drivers/tty/serial/icom.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
[PATCH] serial: icom: fix inconsistent indenting warning
Posted by Charles Han 11 months, 1 week ago
Fix below inconsistent indenting smatch warning.
smatch warnings:
drivers/tty/serial/icom.c:1768 icom_probe() warn: inconsistent indenting

Signed-off-by: Charles Han <hanchunchao@inspur.com>
---
 drivers/tty/serial/icom.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index 29e42831df39..6779d8ea1487 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -1764,11 +1764,11 @@ static int icom_probe(struct pci_dev *dev,
 		goto probe_exit1;
 	}
 
-	 /* save off irq and request irq line */
-	 retval = request_irq(dev->irq, icom_interrupt, IRQF_SHARED, ICOM_DRIVER_NAME, (void *)icom_adapter);
-	 if (retval) {
-		  goto probe_exit2;
-	 }
+	/* save off irq and request irq line */
+	retval = request_irq(dev->irq, icom_interrupt,
+			IRQF_SHARED, ICOM_DRIVER_NAME, (void *)icom_adapter);
+	if (retval)
+		goto probe_exit2;
 
 	retval = icom_load_ports(icom_adapter);
 
-- 
2.43.0
Re: [PATCH] serial: icom: fix inconsistent indenting warning
Posted by Jiri Slaby 11 months, 1 week ago
On 05. 03. 25, 9:37, Charles Han wrote:
> Fix below inconsistent indenting smatch warning.
> smatch warnings:
> drivers/tty/serial/icom.c:1768 icom_probe() warn: inconsistent indenting
> 
> Signed-off-by: Charles Han <hanchunchao@inspur.com>
> ---
>   drivers/tty/serial/icom.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
> index 29e42831df39..6779d8ea1487 100644
> --- a/drivers/tty/serial/icom.c
> +++ b/drivers/tty/serial/icom.c
> @@ -1764,11 +1764,11 @@ static int icom_probe(struct pci_dev *dev,
>   		goto probe_exit1;
>   	}
>   
> -	 /* save off irq and request irq line */
> -	 retval = request_irq(dev->irq, icom_interrupt, IRQF_SHARED, ICOM_DRIVER_NAME, (void *)icom_adapter);
> -	 if (retval) {
> -		  goto probe_exit2;
> -	 }
> +	/* save off irq and request irq line */
> +	retval = request_irq(dev->irq, icom_interrupt,
> +			IRQF_SHARED, ICOM_DRIVER_NAME, (void *)icom_adapter);

In fact, if you removed that useless (void *) too, the code would fit on 
a single 100c line.

> +	if (retval)
> +		goto probe_exit2;

You removed also { and }. That has nothing to do with the $SUBJECT or 
commit log.

thanks,
-- 
js
suse labs
[PATCH v2] serial: icom: fix code format problems
Posted by Charles Han 11 months, 1 week ago
Fix below inconsistent indenting smatch warning.
smatch warnings:
drivers/tty/serial/icom.c:1768 icom_probe() warn: inconsistent indenting

Removed that useless (void *), the code would fit on a single 100c line
Removed  '{' and '}'.

Signed-off-by: Charles Han <hanchunchao@inspur.com>
---
 drivers/tty/serial/icom.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index 29e42831df39..7fb995a8490e 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -1764,11 +1764,10 @@ static int icom_probe(struct pci_dev *dev,
 		goto probe_exit1;
 	}
 
-	 /* save off irq and request irq line */
-	 retval = request_irq(dev->irq, icom_interrupt, IRQF_SHARED, ICOM_DRIVER_NAME, (void *)icom_adapter);
-	 if (retval) {
-		  goto probe_exit2;
-	 }
+	/* save off irq and request irq line */
+	retval = request_irq(dev->irq, icom_interrupt, IRQF_SHARED, ICOM_DRIVER_NAME, icom_adapter);
+	if (retval)
+		goto probe_exit2;
 
 	retval = icom_load_ports(icom_adapter);
 
-- 
2.43.0