vserver 1.9.5.x5

[linux-2.6.git] / drivers / net / wireless / prism54 / isl_38xx.c

diff --git a/drivers/net/wireless/prism54/isl_38xx.c b/drivers/net/wireless/prism54/isl_38xx.c
index 6511891..92eda51 100644 (file)
--- a/drivers/net/wireless/prism54/isl_38xx.c
+++ b/drivers/net/wireless/prism54/isl_38xx.c
@@ -133,8 +133,8 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base)
                      readl(device_base + ISL38XX_CTRL_STAT_REG));
                udelay(ISL38XX_WRITEIO_DELAY);
 
-               if (reg = readl(device_base + ISL38XX_INT_IDENT_REG),
-                   reg == 0xabadface) {
+               reg = readl(device_base + ISL38XX_INT_IDENT_REG);
+               if (reg == 0xabadface) {
 #if VERBOSE > SHOW_ERROR_MESSAGES
                        do_gettimeofday(&current_time);
                        DEBUG(SHOW_TRACING,
@@ -192,10 +192,8 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base)
 void
 isl38xx_interface_reset(void __iomem *device_base, dma_addr_t host_address)
 {
-       u32 reg;
-
 #if VERBOSE > SHOW_ERROR_MESSAGES
-       DEBUG(SHOW_FUNCTION_CALLS, "isl38xx_interface_reset \n");
+       DEBUG(SHOW_FUNCTION_CALLS, "isl38xx_interface_reset\n");
 #endif
 
        /* load the address of the control block in the device */
@@ -203,8 +201,7 @@ isl38xx_interface_reset(void __iomem *device_base, dma_addr_t host_address)
        udelay(ISL38XX_WRITEIO_DELAY);
 
        /* set the reset bit in the Device Interrupt Register */
-       isl38xx_w32_flush(device_base, ISL38XX_DEV_INT_RESET,
-                         ISL38XX_DEV_INT_REG);
+       isl38xx_w32_flush(device_base, ISL38XX_DEV_INT_RESET, ISL38XX_DEV_INT_REG);
        udelay(ISL38XX_WRITEIO_DELAY);
 
        /* enable the interrupt for detecting initialization */
@@ -212,9 +209,7 @@ isl38xx_interface_reset(void __iomem *device_base, dma_addr_t host_address)
        /* Note: Do not enable other interrupts here. We want the
         * device to have come up first 100% before allowing any other 
         * interrupts. */
-       reg = ISL38XX_INT_IDENT_INIT;
-
-       isl38xx_w32_flush(device_base, reg, ISL38XX_INT_EN_REG);
+       isl38xx_w32_flush(device_base, ISL38XX_INT_IDENT_INIT, ISL38XX_INT_EN_REG);
        udelay(ISL38XX_WRITEIO_DELAY);  /* allow complete full reset */
 }