From 026e14ae3951d7ecb7af4e472d9c8dccf66e2f69 Mon Sep 17 00:00:00 2001 From: Ajay Singh Date: Wed, 2 May 2018 12:43:27 +0530 Subject: [PATCH] staging: wilc1000: remove inner block in wilc_netdev_init() Cleanup patch to remove unnecessary inner block ( {/**/} ) in wilc_netdev_init(). Signed-off-by: Ajay Singh Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/linux_wlan.c | 34 +++++++++++++-------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 35e30c5ca752..491baebb2a9e 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1141,6 +1141,8 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, register_inetaddr_notifier(&g_dev_notifier); for (i = 0; i < NUM_CONCURRENT_IFC; i++) { + struct wireless_dev *wdev; + ndev = alloc_etherdev(sizeof(struct wilc_vif)); if (!ndev) return -ENOMEM; @@ -1163,28 +1165,24 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, ndev->netdev_ops = &wilc_netdev_ops; - { - struct wireless_dev *wdev; - - wdev = wilc_create_wiphy(ndev, dev); + wdev = wilc_create_wiphy(ndev, dev); - if (dev) - SET_NETDEV_DEV(ndev, dev); + if (dev) + SET_NETDEV_DEV(ndev, dev); - if (!wdev) { - netdev_err(ndev, "Can't register WILC Wiphy\n"); - return -1; - } - - vif->ndev->ieee80211_ptr = wdev; - vif->ndev->ml_priv = vif; - wdev->netdev = vif->ndev; - vif->netstats.rx_packets = 0; - vif->netstats.tx_packets = 0; - vif->netstats.rx_bytes = 0; - vif->netstats.tx_bytes = 0; + if (!wdev) { + netdev_err(ndev, "Can't register WILC Wiphy\n"); + return -1; } + vif->ndev->ieee80211_ptr = wdev; + vif->ndev->ml_priv = vif; + wdev->netdev = vif->ndev; + vif->netstats.rx_packets = 0; + vif->netstats.tx_packets = 0; + vif->netstats.rx_bytes = 0; + vif->netstats.tx_bytes = 0; + ret = register_netdev(ndev); if (ret) return ret; -- 2.30.2