iop_adma: cleanup iop_chan_xor_slot_count

[linux-2.6-omap-h63xx.git] / drivers / mfd / asic3.c

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 63fb1ff3ad100b61b8a441cae9435fdb0186c264..ef8a492766a72b5d13076bd8f8d7ab9cf4a0e6f5 100644 (file)
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -28,14 +28,14 @@
 static inline void asic3_write_register(struct asic3 *asic,
                                 unsigned int reg, u32 value)
 {
-       iowrite16(value, (unsigned long)asic->mapping +
+       iowrite16(value, asic->mapping +
                  (reg >> asic->bus_shift));
 }
 
 static inline u32 asic3_read_register(struct asic3 *asic,
                               unsigned int reg)
 {
-       return ioread16((unsigned long)asic->mapping +
+       return ioread16(asic->mapping +
                        (reg >> asic->bus_shift));
 }
 
@@ -132,7 +132,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
 
        if (iter >= MAX_ASIC_ISR_LOOPS)
                printk(KERN_ERR "%s: interrupt processing overrun\n",
-                      __FUNCTION__);
+                      __func__);
 }
 
 static inline int asic3_irq_to_bank(struct asic3 *asic, int irq)
@@ -409,7 +409,7 @@ int asic3_gpio_get_value(struct asic3 *asic, unsigned gpio)
                return asic3_get_gpio_d(asic, Status) & mask;
        default:
                printk(KERN_ERR "%s: invalid GPIO value 0x%x",
-                      __FUNCTION__, gpio);
+                      __func__, gpio);
                return -EINVAL;
        }
 }
@@ -437,7 +437,7 @@ void asic3_gpio_set_value(struct asic3 *asic, unsigned gpio, int val)
                return;
        default:
                printk(KERN_ERR "%s: invalid GPIO value 0x%x",
-                      __FUNCTION__, gpio);
+                      __func__, gpio);
                return;
        }
 }