Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells...

[karo-tx-linux.git] / drivers / net / wireless / ipw2x00 / ipw2100.c

diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 29b8fa1adefde125d62608f3b9513e53afba247a..d92b21a8e5977c19b528dfe9038d23aec96f708c 100644 (file)
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -1788,10 +1788,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
        }
 
        /* Initialize the geo */
-       if (libipw_set_geo(priv->ieee, &ipw_geos[0])) {
-               printk(KERN_WARNING DRV_NAME "Could not set geo\n");
-               return 0;
-       }
+       libipw_set_geo(priv->ieee, &ipw_geos[0]);
        priv->ieee->freq_band = LIBIPW_24GHZ_BAND;
 
        lock = LOCK_NONE;
@@ -6413,7 +6410,7 @@ out:
        goto out;
 }
 
-static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
+static void ipw2100_pci_remove_one(struct pci_dev *pci_dev)
 {
        struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);
        struct net_device *dev = priv->net_dev;
@@ -6609,7 +6606,7 @@ static struct pci_driver ipw2100_pci_driver = {
        .name = DRV_NAME,
        .id_table = ipw2100_pci_id_table,
        .probe = ipw2100_pci_init_one,
-       .remove = __devexit_p(ipw2100_pci_remove_one),
+       .remove = ipw2100_pci_remove_one,
 #ifdef CONFIG_PM
        .suspend = ipw2100_suspend,
        .resume = ipw2100_resume,