[PATCH] fixup! staging/wilc1000: split out bus specific modules

From: Arnd Bergmann
Date: Wed Oct 21 2015 - 10:21:03 EST


The patch to split out bus modules causes new valid build warnings without this.

Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 8a5f4673c5d0..fe3b464f0d5c 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1594,7 +1594,7 @@ int wilc_netdev_init(struct device *dev, const struct wilc1000_ops *ops,
}
EXPORT_SYMBOL_GPL(wilc_netdev_init);

-void __init wilc1000_init_driver(void)
+void wilc1000_init_driver(void)
{
#if defined(WILC_DEBUGFS)
if (wilc_debugfs_init() < 0)
@@ -1606,7 +1606,7 @@ void __init wilc1000_init_driver(void)
}
EXPORT_SYMBOL_GPL(wilc1000_init_driver);

-void __exit wilc_netdev_free(struct wilc *wilc1000_dev)
+void wilc_netdev_free(struct wilc *wilc1000_dev)
{
int i = 0;
perInterface_wlan_t *nic[NUM_CONCURRENT_IFC] = {NULL,};
@@ -1653,7 +1653,7 @@ void __exit wilc_netdev_free(struct wilc *wilc1000_dev)
}
EXPORT_SYMBOL_GPL(wilc_netdev_free);

-void __exit wilc1000_exit_driver(void)
+void wilc1000_exit_driver(void)
{
kfree(wilc1000_dev);
wilc1000_dev = NULL;
diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index f684d5bf465d..b460b7f6971a 100644
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -320,7 +320,7 @@ int wilc1000_wlan_get_num_conn_ifcs(void);
int wilc1000_mac_xmit(struct sk_buff *skb, struct net_device *dev);
int wilc_netdev_init(struct device *, const struct wilc1000_ops *ops,
const struct wilc1000_hif_ops *hif_ops, int gpio);
-void __exit wilc_netdev_free(struct wilc *wilc1000_dev);
+void wilc_netdev_free(struct wilc *wilc1000_dev);

void wilc_handle_isr(void);

@@ -340,7 +340,7 @@ extern bool wilc1000_enable_ps;
int wilc1000_firmware_download(struct wilc *p_nic);
int wilc1000_start_firmware(struct wilc_per_interface *nic);

-void __init wilc1000_init_driver(void);
-void __exit wilc1000_exit_driver(void);
+void wilc1000_init_driver(void);
+void wilc1000_exit_driver(void);

#endif



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/