Skip to contentSkip to conversation

prism54: small prismcompat cleanup

PATCH New Adrian Bunk 1 participant 1 message Oct 30, 2004

Subsystems (3)
Networking Network drivers Networking drivers (wireless)
lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 prism54: small prismcompat cleanup

- the FW_LOADER is already guaranteed through the Kconfig file
- prism54_synchronize_irq is also #define'd to synchronize_irq in prismcompat24.h, so there's no need for it

diffstat output:

 drivers/net/wireless/prism54/islpci_dev.c  |    2 +-
 drivers/net/wireless/prism54/prismcompat.h |    6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)
Signed-off-by Adrian Bunk <[email protected]>
drivers/net/wireless/prism54/prismcompat.h renamed from drivers/net/wireless/prism54/prismcompat.h.old +0 -6
@@ -34,12 +34,6 @@
 #include <linux/workqueue.h>
 #include <linux/compiler.h>
 
-#if !defined(CONFIG_FW_LOADER) && !defined(CONFIG_FW_LOADER_MODULE)
-#error Firmware Loading is not configured in the kernel !
-#endif
-
-#define prism54_synchronize_irq(irq) synchronize_irq(irq)
-
 #define PRISM_FW_PDEV		&priv->pdev->dev
 
 #endif				/* _PRISM_COMPAT_H */
drivers/net/wireless/prism54/islpci_dev.c renamed from drivers/net/wireless/prism54/islpci_dev.c.old2 +1 -1
@@ -420,7 +420,7 @@
 	 * currently in progress by emptying the TX and RX queues. */
 
 	/* wait until interrupts have finished executing on other CPUs */
-	prism54_synchronize_irq(priv->pdev->irq);
+	synchronize_irq(priv->pdev->irq);
 
 	reg = readl(device_base + ISL38XX_CTRL_STAT_REG);
 	reg &= ~(ISL38XX_CTRL_STAT_RESET | ISL38XX_CTRL_STAT_RAMBOOT);