Merge branch 'x86/crashdump' into x86/urgent

[linux-2.6] / drivers / mfd / asic3.c

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 9931581b08a13da429b993247af7a708e3a33259..eabf0bfccab4a0ca052ac290c26b0b193082df86 100644 (file)
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -137,7 +137,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
                for (i = ASIC3_NUM_GPIOS; i < ASIC3_NR_IRQS; i++) {
                        /* They start at bit 4 and go up */
                        if (status & (1 << (i - ASIC3_NUM_GPIOS + 4))) {
-                               desc = irq_desc +  + i;
+                               desc = irq_desc + asic->irq_base + i;
                                desc->handle_irq(asic->irq_base + i,
                                                 desc);
                        }
@@ -308,15 +308,18 @@ static struct irq_chip asic3_irq_chip = {
        .unmask         = asic3_unmask_irq,
 };
 
-static int asic3_irq_probe(struct platform_device *pdev)
+static int __init asic3_irq_probe(struct platform_device *pdev)
 {
        struct asic3 *asic = platform_get_drvdata(pdev);
        unsigned long clksel = 0;
        unsigned int irq, irq_base;
+       int map_size;
+       int ret;
 
-       asic->irq_nr = platform_get_irq(pdev, 0);
-       if (asic->irq_nr < 0)
-               return asic->irq_nr;
+       ret = platform_get_irq(pdev, 0);
+       if (ret < 0)
+               return ret;
+       asic->irq_nr = ret;
 
        /* turn on clock to IRQ controller */
        clksel |= CLOCK_SEL_CX;
@@ -464,8 +467,8 @@ static void asic3_gpio_set(struct gpio_chip *chip,
        return;
 }
 
-static int asic3_gpio_probe(struct platform_device *pdev,
-                           u16 *gpio_config, int num)
+static __init int asic3_gpio_probe(struct platform_device *pdev,
+                                  u16 *gpio_config, int num)
 {
        struct asic3 *asic = platform_get_drvdata(pdev);
        u16 alt_reg[ASIC3_NUM_GPIO_BANKS];
@@ -473,9 +476,9 @@ static int asic3_gpio_probe(struct platform_device *pdev,
        u16 dir_reg[ASIC3_NUM_GPIO_BANKS];
        int i;
 
-       memset(alt_reg, 0, ASIC3_NUM_GPIO_BANKS);
-       memset(out_reg, 0, ASIC3_NUM_GPIO_BANKS);
-       memset(dir_reg, 0, ASIC3_NUM_GPIO_BANKS);
+       memzero(alt_reg, ASIC3_NUM_GPIO_BANKS * sizeof(u16));
+       memzero(out_reg, ASIC3_NUM_GPIO_BANKS * sizeof(u16));
+       memzero(dir_reg, ASIC3_NUM_GPIO_BANKS * sizeof(u16));
 
        /* Enable all GPIOs */
        asic3_write_register(asic, ASIC3_GPIO_OFFSET(A, MASK), 0xffff);
@@ -526,7 +529,7 @@ static int asic3_gpio_remove(struct platform_device *pdev)
 
 
 /* Core */
-static int asic3_probe(struct platform_device *pdev)
+static int __init asic3_probe(struct platform_device *pdev)
 {
        struct asic3_platform_data *pdata = pdev->dev.platform_data;
        struct asic3 *asic;
@@ -551,8 +554,8 @@ static int asic3_probe(struct platform_device *pdev)
                goto out_free;
        }
 
-
-       asic->mapping = ioremap(mem->start, PAGE_SIZE);
+       map_size = mem->end - mem->start + 1;
+       asic->mapping = ioremap(mem->start, map_size);
        if (!asic->mapping) {
                ret = -ENOMEM;
                dev_err(asic->dev, "Couldn't ioremap\n");
@@ -561,10 +564,8 @@ static int asic3_probe(struct platform_device *pdev)
 
        asic->irq_base = pdata->irq_base;
 
-       if (pdata && pdata->bus_shift)
-               asic->bus_shift = 2 - pdata->bus_shift;
-       else
-               asic->bus_shift = 0;
+       /* calculate bus shift from mem resource */
+       asic->bus_shift = 2 - (map_size >> 12);
 
        clksel = 0;
        asic3_write_register(asic, ASIC3_OFFSET(CLOCK, SEL), clksel);
@@ -633,7 +634,6 @@ static struct platform_driver asic3_device_driver = {
        .driver         = {
                .name   = "asic3",
        },
-       .probe          = asic3_probe,
        .remove         = __devexit_p(asic3_remove),
        .shutdown       = asic3_shutdown,
 };
@@ -641,7 +641,7 @@ static struct platform_driver asic3_device_driver = {
 static int __init asic3_init(void)
 {
        int retval = 0;
-       retval = platform_driver_register(&asic3_device_driver);
+       retval = platform_driver_probe(&asic3_device_driver, asic3_probe);
        return retval;
 }