* [Trivial PATCH] staging: Remove unnecessary semicolons
@ 2013-10-10 23:07 Joe Perches
2013-10-12 10:44 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Joe Perches @ 2013-10-10 23:07 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Jonathan Cameron, linux-iio, devel, LKML
These aren't necessary after switch, if and while statements.
Also remove some unnecessary braces where these
semicolons were removed around single statement
and some unnecessary blank lines.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/staging/iio/adc/ad7291.c | 2 +-
drivers/staging/iio/cdc/ad7150.c | 2 +-
drivers/staging/imx-drm/imx-tve.c | 2 +-
drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_recv.c | 2 +-
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 10 ++--------
6 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
index 1dae1ef..ccaa8d6f8 100644
--- a/drivers/staging/iio/adc/ad7291.c
+++ b/drivers/staging/iio/adc/ad7291.c
@@ -290,7 +290,7 @@ static int ad7291_read_event_value(struct iio_dev *indio_dev,
return 0;
default:
return -EINVAL;
- };
+ }
}
static int ad7291_write_event_value(struct iio_dev *indio_dev,
diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c
index f4a0341..618d820 100644
--- a/drivers/staging/iio/cdc/ad7150.c
+++ b/drivers/staging/iio/cdc/ad7150.c
@@ -300,7 +300,7 @@ static int ad7150_read_event_value(struct iio_dev *indio_dev,
default:
return -EINVAL;
- };
+ }
}
static int ad7150_write_event_value(struct iio_dev *indio_dev,
diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c
index 33d6525..59dd4d5 100644
--- a/drivers/staging/imx-drm/imx-tve.c
+++ b/drivers/staging/imx-drm/imx-tve.c
@@ -696,7 +696,7 @@ static int imx_tve_probe(struct platform_device *pdev)
if (val != 0x00100000) {
dev_err(&pdev->dev, "configuration register default value indicates this is not a TVEv2\n");
return -ENODEV;
- };
+ }
/* disable cable detection for VGA mode */
ret = regmap_write(tve->regmap, TVE_CD_CONT_REG, 0);
diff --git a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
index f6268dc..ea37715 100644
--- a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
+++ b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
@@ -282,7 +282,7 @@ __s64 lprocfs_read_helper(struct lprocfs_counter *lc,
break;
default:
break;
- };
+ }
return ret;
}
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index ba8e534..9f0f30f7 100644
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -1586,7 +1586,7 @@ _func_enter_;
pfhdr->attrib.icv_len = pnfhdr->attrib.icv_len;
plist = get_next(plist);
- };
+ }
/* free the defrag_q queue and return the prframe */
rtw_free_recvframe_queue(defrag_q, pfree_recv_queue);
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 7d322f3..b01f6f5 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1888,9 +1888,8 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
skb_push(skb, priv->rtllib->tx_headroom);
ret = rtl8192_tx(dev, skb);
- if (ret != 0) {
+ if (ret != 0)
kfree_skb(skb);
- };
if (queue_index != MGNT_QUEUE) {
priv->rtllib->stats.tx_bytes += (skb->len -
@@ -1898,7 +1897,6 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
priv->rtllib->stats.tx_packets++;
}
-
return;
}
@@ -1930,15 +1928,11 @@ int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
tcb_desc->bTxEnableFwCalcDur = 1;
skb_push(skb, priv->rtllib->tx_headroom);
ret = rtl8192_tx(dev, skb);
- if (ret != 0) {
+ if (ret != 0)
kfree_skb(skb);
- };
}
-
-
return ret;
-
}
static void rtl8192_tx_isr(struct net_device *dev, int prio)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Trivial PATCH] staging: Remove unnecessary semicolons
2013-10-10 23:07 [Trivial PATCH] staging: Remove unnecessary semicolons Joe Perches
@ 2013-10-12 10:44 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2013-10-12 10:44 UTC (permalink / raw)
To: Joe Perches, Greg Kroah-Hartman; +Cc: linux-iio, devel, LKML
On 10/11/13 00:07, Joe Perches wrote:
> These aren't necessary after switch, if and while statements.
>
> Also remove some unnecessary braces where these
> semicolons were removed around single statement
> and some unnecessary blank lines.
>
> Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
(for the iio ones).
> ---
> drivers/staging/iio/adc/ad7291.c | 2 +-
> drivers/staging/iio/cdc/ad7150.c | 2 +-
> drivers/staging/imx-drm/imx-tve.c | 2 +-
> drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 2 +-
> drivers/staging/rtl8188eu/core/rtw_recv.c | 2 +-
> drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 10 ++--------
> 6 files changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
> index 1dae1ef..ccaa8d6f8 100644
> --- a/drivers/staging/iio/adc/ad7291.c
> +++ b/drivers/staging/iio/adc/ad7291.c
> @@ -290,7 +290,7 @@ static int ad7291_read_event_value(struct iio_dev *indio_dev,
> return 0;
> default:
> return -EINVAL;
> - };
> + }
> }
>
> static int ad7291_write_event_value(struct iio_dev *indio_dev,
> diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c
> index f4a0341..618d820 100644
> --- a/drivers/staging/iio/cdc/ad7150.c
> +++ b/drivers/staging/iio/cdc/ad7150.c
> @@ -300,7 +300,7 @@ static int ad7150_read_event_value(struct iio_dev *indio_dev,
>
> default:
> return -EINVAL;
> - };
> + }
> }
>
> static int ad7150_write_event_value(struct iio_dev *indio_dev,
> diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c
> index 33d6525..59dd4d5 100644
> --- a/drivers/staging/imx-drm/imx-tve.c
> +++ b/drivers/staging/imx-drm/imx-tve.c
> @@ -696,7 +696,7 @@ static int imx_tve_probe(struct platform_device *pdev)
> if (val != 0x00100000) {
> dev_err(&pdev->dev, "configuration register default value indicates this is not a TVEv2\n");
> return -ENODEV;
> - };
> + }
>
> /* disable cable detection for VGA mode */
> ret = regmap_write(tve->regmap, TVE_CD_CONT_REG, 0);
> diff --git a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
> index f6268dc..ea37715 100644
> --- a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
> +++ b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
> @@ -282,7 +282,7 @@ __s64 lprocfs_read_helper(struct lprocfs_counter *lc,
> break;
> default:
> break;
> - };
> + }
>
> return ret;
> }
> diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
> index ba8e534..9f0f30f7 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_recv.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
> @@ -1586,7 +1586,7 @@ _func_enter_;
>
> pfhdr->attrib.icv_len = pnfhdr->attrib.icv_len;
> plist = get_next(plist);
> - };
> + }
>
> /* free the defrag_q queue and return the prframe */
> rtw_free_recvframe_queue(defrag_q, pfree_recv_queue);
> diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
> index 7d322f3..b01f6f5 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
> @@ -1888,9 +1888,8 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
> memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
> skb_push(skb, priv->rtllib->tx_headroom);
> ret = rtl8192_tx(dev, skb);
> - if (ret != 0) {
> + if (ret != 0)
> kfree_skb(skb);
> - };
>
> if (queue_index != MGNT_QUEUE) {
> priv->rtllib->stats.tx_bytes += (skb->len -
> @@ -1898,7 +1897,6 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
> priv->rtllib->stats.tx_packets++;
> }
>
> -
> return;
> }
>
> @@ -1930,15 +1928,11 @@ int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
> tcb_desc->bTxEnableFwCalcDur = 1;
> skb_push(skb, priv->rtllib->tx_headroom);
> ret = rtl8192_tx(dev, skb);
> - if (ret != 0) {
> + if (ret != 0)
> kfree_skb(skb);
> - };
> }
>
> -
> -
> return ret;
> -
> }
>
> static void rtl8192_tx_isr(struct net_device *dev, int prio)
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-12 9:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-10 23:07 [Trivial PATCH] staging: Remove unnecessary semicolons Joe Perches
2013-10-12 10:44 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).