[PATCH] ipw2100: assume recent kernel

ipw2100 still has support for old kernels.  Thats considered bad for patch in
mainline...  this fixes few instances.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 2f2ae1777805092687ece307fcd01afe28c82055..d2b70f6e99dd0cc953ff42ccf2599c0ef801f606 100644 (file)
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -6702,17 +6702,9 @@ static int ipw2100_suspend(struct pci_dev *pci_dev, pm_message_t state)
        /* Remove the PRESENT state of the device */
        netif_device_detach(dev);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-       pci_save_state(pci_dev, priv->pm_state);
-#else
        pci_save_state(pci_dev);
-#endif
        pci_disable_device (pci_dev);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
-       pci_set_power_state(pci_dev, state);
-#else
        pci_set_power_state(pci_dev, PCI_D3hot);
-#endif
 
        up(&priv->action_sem);
 
@@ -6733,17 +6725,9 @@ static int ipw2100_resume(struct pci_dev *pci_dev)
        IPW_DEBUG_INFO("%s: Coming out of suspend...\n",
               dev->name);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
-       pci_set_power_state(pci_dev, 0);
-#else
        pci_set_power_state(pci_dev, PCI_D0);
-#endif
        pci_enable_device(pci_dev);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-       pci_restore_state(pci_dev, priv->pm_state);
-#else
        pci_restore_state(pci_dev);
-#endif
 
        /*
         * Suspend/Resume resets the PCI configuration space, so we have to

diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h
index 40a1373defa92d6a08dc9aec299c7bcd6b158f91..2980900beb536a0fea9afd9ab8a2970720053944 100644 (file)
--- a/drivers/net/wireless/ipw2100.h
+++ b/drivers/net/wireless/ipw2100.h
@@ -44,30 +44,6 @@
 
 #include <linux/workqueue.h>
 
-#ifndef IRQ_NONE
-typedef void irqreturn_t;
-#define IRQ_NONE
-#define IRQ_HANDLED
-#define IRQ_RETVAL(x)
-#endif
-
-#if WIRELESS_EXT < 17
-#define IW_QUAL_QUAL_INVALID  0x10
-#define IW_QUAL_LEVEL_INVALID 0x20
-#define IW_QUAL_NOISE_INVALID 0x40
-#endif
-
-#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) )
-#define pci_dma_sync_single_for_cpu    pci_dma_sync_single
-#define pci_dma_sync_single_for_device pci_dma_sync_single
-#endif
-
-#ifndef HAVE_FREE_NETDEV
-#define free_netdev(x) kfree(x)
-#endif
-
-
-
 struct ipw2100_priv;
 struct ipw2100_tx_packet;
 struct ipw2100_rx_packet;