| Message ID | 20190301080900.6656-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f819cd926ca7c9105fa0086dcb7e5930c200d6c6 |
| Headers | show |
| Series | [net-next] drivers: net: Remove unnecessary semicolon | expand |
On Fri, 2019-03-01 at 16:09 +0800, Yue Haibing wrote: > From: YueHaibing <yuehaibing@huawei.com> > > drivers/net/dsa/mt7530.c:649:3-4: Unneeded semicolon > drivers/net/ethernet/cisco/enic/enic_clsf.c:35:2-3: Unneeded semicolon > drivers/net/ethernet/faraday/ftgmac100.c:1640:2-3: Unneeded semicolon > drivers/net/ethernet/mediatek/mtk_eth_soc.c:229:2-3: Unneeded semicolon > drivers/net/usb/sr9700.c:437:2-3: Unneeded semicolon > > Remove unneeded semicolon. > > Generated by: scripts/coccinelle/misc/semicolon.cocci > Acked-by: Sean Wang <sean.wang@mediatek.com> for mt7530 and mtk_eth_soc thanks! > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > drivers/net/dsa/mt7530.c | 2 +- > drivers/net/ethernet/cisco/enic/enic_clsf.c | 3 ++- > drivers/net/ethernet/faraday/ftgmac100.c | 2 +- > drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- > drivers/net/usb/sr9700.c | 2 +- > 5 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c > index 0390c5e..7357b4f 100644 > --- a/drivers/net/dsa/mt7530.c > +++ b/drivers/net/dsa/mt7530.c > @@ -646,7 +646,7 @@ static void mt7530_adjust_link(struct dsa_switch *ds, int port, > case SPEED_100: > mcr |= PMCR_FORCE_SPEED_100; > break; > - }; > + } > > if (phydev->link) > mcr |= PMCR_FORCE_LNK; > diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.c b/drivers/net/ethernet/cisco/enic/enic_clsf.c > index 99038df..9900993 100644 > --- a/drivers/net/ethernet/cisco/enic/enic_clsf.c > +++ b/drivers/net/ethernet/cisco/enic/enic_clsf.c > @@ -32,7 +32,8 @@ int enic_addfltr_5t(struct enic *enic, struct flow_keys *keys, u16 rq) > break; > default: > return -EPROTONOSUPPORT; > - }; > + } > + > data.type = FILTER_IPV4_5TUPLE; > data.u.ipv4.src_addr = ntohl(keys->addrs.v4addrs.src); > data.u.ipv4.dst_addr = ntohl(keys->addrs.v4addrs.dst); > diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c > index 3e5e971..b17b79e 100644 > --- a/drivers/net/ethernet/faraday/ftgmac100.c > +++ b/drivers/net/ethernet/faraday/ftgmac100.c > @@ -1637,7 +1637,7 @@ static int ftgmac100_setup_mdio(struct net_device *netdev) > reg = ioread32(priv->base + FTGMAC100_OFFSET_REVR); > reg &= ~FTGMAC100_REVR_NEW_MDIO_INTERFACE; > iowrite32(reg, priv->base + FTGMAC100_OFFSET_REVR); > - }; > + } > > /* Get PHY mode from device-tree */ > if (np) { > diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > index 94d4663..549d364 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > @@ -226,7 +226,7 @@ static void mtk_phy_link_adjust(struct net_device *dev) > case SPEED_100: > mcr |= MAC_MCR_SPEED_100; > break; > - }; > + } > > if (MTK_HAS_CAPS(mac->hw->soc->caps, MTK_GMAC1_TRGMII) && > !mac->id && !mac->trgmii) > diff --git a/drivers/net/usb/sr9700.c b/drivers/net/usb/sr9700.c > index 6ac232e..e04c8054 100644 > --- a/drivers/net/usb/sr9700.c > +++ b/drivers/net/usb/sr9700.c > @@ -434,7 +434,7 @@ static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb) > usbnet_skb_return(dev, sr_skb); > > skb_pull(skb, len + SR_RX_OVERHEAD); > - }; > + } > > return 0; > }
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 0390c5e..7357b4f 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -646,7 +646,7 @@ static void mt7530_adjust_link(struct dsa_switch *ds, int port, case SPEED_100: mcr |= PMCR_FORCE_SPEED_100; break; - }; + } if (phydev->link) mcr |= PMCR_FORCE_LNK; diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.c b/drivers/net/ethernet/cisco/enic/enic_clsf.c index 99038df..9900993 100644 --- a/drivers/net/ethernet/cisco/enic/enic_clsf.c +++ b/drivers/net/ethernet/cisco/enic/enic_clsf.c @@ -32,7 +32,8 @@ int enic_addfltr_5t(struct enic *enic, struct flow_keys *keys, u16 rq) break; default: return -EPROTONOSUPPORT; - }; + } + data.type = FILTER_IPV4_5TUPLE; data.u.ipv4.src_addr = ntohl(keys->addrs.v4addrs.src); data.u.ipv4.dst_addr = ntohl(keys->addrs.v4addrs.dst); diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 3e5e971..b17b79e 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -1637,7 +1637,7 @@ static int ftgmac100_setup_mdio(struct net_device *netdev) reg = ioread32(priv->base + FTGMAC100_OFFSET_REVR); reg &= ~FTGMAC100_REVR_NEW_MDIO_INTERFACE; iowrite32(reg, priv->base + FTGMAC100_OFFSET_REVR); - }; + } /* Get PHY mode from device-tree */ if (np) { diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 94d4663..549d364 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -226,7 +226,7 @@ static void mtk_phy_link_adjust(struct net_device *dev) case SPEED_100: mcr |= MAC_MCR_SPEED_100; break; - }; + } if (MTK_HAS_CAPS(mac->hw->soc->caps, MTK_GMAC1_TRGMII) && !mac->id && !mac->trgmii) diff --git a/drivers/net/usb/sr9700.c b/drivers/net/usb/sr9700.c index 6ac232e..e04c8054 100644 --- a/drivers/net/usb/sr9700.c +++ b/drivers/net/usb/sr9700.c @@ -434,7 +434,7 @@ static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb) usbnet_skb_return(dev, sr_skb); skb_pull(skb, len + SR_RX_OVERHEAD); - }; + } return 0; }