13 files changed, 64 insertions, 56 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index edadbdad31d0..e03653d69357 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -430,7 +430,7 @@ config GPIO_ML_IOH
 
 config GPIO_SODAVILLE
         bool "Intel Sodaville GPIO support"
-        depends on X86 && PCI && OF && BROKEN
+        depends on X86 && PCI && OF
         select GPIO_GENERIC
         select GENERIC_IRQ_CHIP
         help
diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c
index 9ad1703d1408..ae5d7f12ce66 100644
--- a/drivers/gpio/gpio-adp5588.c
+++ b/drivers/gpio/gpio-adp5588.c
@@ -252,7 +252,7 @@ static irqreturn_t adp5588_irq_handler(int irq, void *devid)
                 if (ret < 0)
                         memset(dev->irq_stat, 0, ARRAY_SIZE(dev->irq_stat));
 
-                for (bank = 0; bank <= ADP5588_BANK(ADP5588_MAXGPIO);
+                for (bank = 0, bit = 0; bank <= ADP5588_BANK(ADP5588_MAXGPIO);
                         bank++, bit = 0) {
                         pending = dev->irq_stat[bank] & dev->irq_mask[bank];
 
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index 46277877b7ec..19d6fc0229c3 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -2382,8 +2382,8 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = {
 #endif
 };
 
-static struct samsung_gpio_chip exynos5_gpios_1[] = {
 #ifdef CONFIG_ARCH_EXYNOS5
+static struct samsung_gpio_chip exynos5_gpios_1[] = {
         {
                 .chip   = {
                         .base   = EXYNOS5_GPA0(0),
@@ -2541,11 +2541,11 @@ static struct samsung_gpio_chip exynos5_gpios_1[] = {
                         .to_irq = samsung_gpiolib_to_irq,
                 },
         },
-#endif
 };
+#endif
 
-static struct samsung_gpio_chip exynos5_gpios_2[] = {
 #ifdef CONFIG_ARCH_EXYNOS5
+static struct samsung_gpio_chip exynos5_gpios_2[] = {
         {
                 .chip   = {
                         .base   = EXYNOS5_GPE0(0),
@@ -2602,11 +2602,11 @@ static struct samsung_gpio_chip exynos5_gpios_2[] = {
 
                 },
         },
-#endif
 };
+#endif
 
-static struct samsung_gpio_chip exynos5_gpios_3[] = {
 #ifdef CONFIG_ARCH_EXYNOS5
+static struct samsung_gpio_chip exynos5_gpios_3[] = {
         {
                 .chip   = {
                         .base   = EXYNOS5_GPV0(0),
@@ -2638,11 +2638,11 @@ static struct samsung_gpio_chip exynos5_gpios_3[] = {
                         .label  = "GPV4",
                 },
         },
-#endif
 };
+#endif
 
-static struct samsung_gpio_chip exynos5_gpios_4[] = {
 #ifdef CONFIG_ARCH_EXYNOS5
+static struct samsung_gpio_chip exynos5_gpios_4[] = {
         {
                 .chip   = {
                         .base   = EXYNOS5_GPZ(0),
@@ -2650,8 +2650,8 @@ static struct samsung_gpio_chip exynos5_gpios_4[] = {
                         .label  = "GPZ",
                 },
         },
-#endif
 };
+#endif
 
 
 #if defined(CONFIG_ARCH_EXYNOS) && defined(CONFIG_OF)
diff --git a/drivers/gpio/gpio-sodaville.c b/drivers/gpio/gpio-sodaville.c
index 9ba15d31d242..031e5d24837d 100644
--- a/drivers/gpio/gpio-sodaville.c
+++ b/drivers/gpio/gpio-sodaville.c
@@ -41,7 +41,7 @@
 struct sdv_gpio_chip_data {
         int irq_base;
         void __iomem *gpio_pub_base;
-        struct irq_domain id;
+        struct irq_domain *id;
         struct irq_chip_generic *gc;
         struct bgpio_chip bgpio;
 };
@@ -51,10 +51,9 @@ static int sdv_gpio_pub_set_type(struct irq_data *d, unsigned int type)
         struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
         struct sdv_gpio_chip_data *sd = gc->private;
         void __iomem *type_reg;
-        u32 irq_offs = d->irq - sd->irq_base;
         u32 reg;
 
-        if (irq_offs < 8)
+        if (d->hwirq < 8)
                 type_reg = sd->gpio_pub_base + GPIT1R0;
         else
                 type_reg = sd->gpio_pub_base + GPIT1R1;
@@ -63,11 +62,11 @@ static int sdv_gpio_pub_set_type(struct irq_data *d, unsigned int type)
 
         switch (type) {
         case IRQ_TYPE_LEVEL_HIGH:
-                reg &= ~BIT(4 * (irq_offs % 8));
+                reg &= ~BIT(4 * (d->hwirq % 8));
                 break;
 
         case IRQ_TYPE_LEVEL_LOW:
-                reg |= BIT(4 * (irq_offs % 8));
+                reg |= BIT(4 * (d->hwirq % 8));
                 break;
 
         default:
@@ -91,7 +90,7 @@ static irqreturn_t sdv_gpio_pub_irq_handler(int irq, void *data)
                 u32 irq_bit = __fls(irq_stat);
 
                 irq_stat &= ~BIT(irq_bit);
-                generic_handle_irq(sd->irq_base + irq_bit);
+                generic_handle_irq(irq_find_mapping(sd->id, irq_bit));
         }
 
         return IRQ_HANDLED;
@@ -127,7 +126,7 @@ static int sdv_xlate(struct irq_domain *h, struct device_node *node,
 }
 
 static struct irq_domain_ops irq_domain_sdv_ops = {
-        .dt_translate   = sdv_xlate,
+        .xlate = sdv_xlate,
 };
 
 static __devinit int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,
@@ -149,10 +148,6 @@ static __devinit int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,
         if (ret)
                 goto out_free_desc;
 
-        sd->id.irq_base = sd->irq_base;
-        sd->id.of_node = of_node_get(pdev->dev.of_node);
-        sd->id.ops = &irq_domain_sdv_ops;
-
         /*
          * This gpio irq controller latches level irqs. Testing shows that if
          * we unmask & ACK the IRQ before the source of the interrupt is gone
@@ -179,7 +174,10 @@ static __devinit int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,
                         IRQ_GC_INIT_MASK_CACHE, IRQ_NOREQUEST,
                         IRQ_LEVEL | IRQ_NOPROBE);
 
-        irq_domain_add(&sd->id);
+        sd->id = irq_domain_add_legacy(pdev->dev.of_node, SDV_NUM_PUB_GPIOS,
+                                sd->irq_base, 0, &irq_domain_sdv_ops, sd);
+        if (!sd->id)
+                goto out_free_irq;
         return 0;
 out_free_irq:
         free_irq(pdev->irq, sd);
@@ -260,7 +258,6 @@ static void sdv_gpio_remove(struct pci_dev *pdev)
 {
         struct sdv_gpio_chip_data *sd = pci_get_drvdata(pdev);
 
-        irq_domain_del(&sd->id);
         free_irq(pdev->irq, sd);
         irq_free_descs(sd->irq_base, SDV_NUM_PUB_GPIOS);
 
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
index 145f13580ff0..9140236a0182 100644
--- a/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
@@ -391,6 +391,7 @@ static ssize_t show_str(struct device *dev,
                 break;
         default:
                 BUG();
+                val = "";
         }
 
         return sprintf(buf, "%s\n", val);
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index be51037363c8..29b319db573e 100644
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -710,13 +710,13 @@ static u16 pmbus_data2reg(struct pmbus_data *data,
  * If a negative value is stored in any of the referenced registers, this value
  * reflects an error code which will be returned.
  */
-static int pmbus_get_boolean(struct pmbus_data *data, int index, int *val)
+static int pmbus_get_boolean(struct pmbus_data *data, int index)
 {
         u8 s1 = (index >> 24) & 0xff;
         u8 s2 = (index >> 16) & 0xff;
         u8 reg = (index >> 8) & 0xff;
         u8 mask = index & 0xff;
-        int status;
+        int ret, status;
         u8 regval;
 
         status = data->status[reg];
@@ -725,7 +725,7 @@ static int pmbus_get_boolean(struct pmbus_data *data, int index, int *val)
 
         regval = status & mask;
         if (!s1 && !s2)
-                *val = !!regval;
+                ret = !!regval;
         else {
                 long v1, v2;
                 struct pmbus_sensor *sensor1, *sensor2;
@@ -739,9 +739,9 @@ static int pmbus_get_boolean(struct pmbus_data *data, int index, int *val)
 
                 v1 = pmbus_reg2data(data, sensor1);
                 v2 = pmbus_reg2data(data, sensor2);
-                *val = !!(regval && v1 >= v2);
+                ret = !!(regval && v1 >= v2);
         }
-        return 0;
+        return ret;
 }
 
 static ssize_t pmbus_show_boolean(struct device *dev,
@@ -750,11 +750,10 @@ static ssize_t pmbus_show_boolean(struct device *dev,
         struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct pmbus_data *data = pmbus_update_device(dev);
         int val;
-        int err;
 
-        err = pmbus_get_boolean(data, attr->index, &val);
-        if (err)
-                return err;
+        val = pmbus_get_boolean(data, attr->index);
+        if (val < 0)
+                return val;
         return snprintf(buf, PAGE_SIZE, "%d\n", val);
 }
 
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index d3b778da3f86..c5f6be478bad 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -343,10 +343,11 @@ exit:
         return err;
 }
 
-static int __init smsc47b397_find(unsigned short *addr)
+static int __init smsc47b397_find(void)
 {
         u8 id, rev;
         char *name;
+        unsigned short addr;
 
         superio_enter();
         id = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);
@@ -370,14 +371,14 @@ static int __init smsc47b397_find(unsigned short *addr)
         rev = superio_inb(SUPERIO_REG_DEVREV);
 
         superio_select(SUPERIO_REG_LD8);
-        *addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8)
+        addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8)
                  |  superio_inb(SUPERIO_REG_BASE_LSB);
 
         pr_info("found SMSC %s (base address 0x%04x, revision %u)\n",
-                name, *addr, rev);
+                name, addr, rev);
 
         superio_exit();
-        return 0;
+        return addr;
 }
 
 static int __init smsc47b397_init(void)
@@ -385,9 +386,10 @@ static int __init smsc47b397_init(void)
         unsigned short address;
         int ret;
 
-        ret = smsc47b397_find(&address);
-        if (ret)
+        ret = smsc47b397_find();
+        if (ret < 0)
                 return ret;
+        address = ret;
 
         ret = platform_driver_register(&smsc47b397_driver);
         if (ret)
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index c590c1469793..b5aa38dd7ab9 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -491,10 +491,10 @@ static const struct attribute_group smsc47m1_group = {
         .attrs = smsc47m1_attributes,
 };
 
-static int __init smsc47m1_find(unsigned short *addr,
-                                struct smsc47m1_sio_data *sio_data)
+static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data)
 {
         u8 val;
+        unsigned short addr;
 
         superio_enter();
         val = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);
@@ -546,9 +546,9 @@ static int __init smsc47m1_find(unsigned short *addr,
         }
 
         superio_select();
-        *addr = (superio_inb(SUPERIO_REG_BASE) << 8)
+        addr = (superio_inb(SUPERIO_REG_BASE) << 8)
               |  superio_inb(SUPERIO_REG_BASE + 1);
-        if (*addr == 0) {
+        if (addr == 0) {
                 pr_info("Device address not set, will not use\n");
                 superio_exit();
                 return -ENODEV;
@@ -565,7 +565,7 @@ static int __init smsc47m1_find(unsigned short *addr,
         }
 
         superio_exit();
-        return 0;
+        return addr;
 }
 
 /* Restore device to its initial state */
@@ -938,13 +938,15 @@ static int __init sm_smsc47m1_init(void)
         unsigned short address;
         struct smsc47m1_sio_data sio_data;
 
-        if (smsc47m1_find(&address, &sio_data))
-                return -ENODEV;
+        err = smsc47m1_find(&sio_data);
+        if (err < 0)
+                return err;
+        address = err;
 
         /* Sets global pdev as a side effect */
         err = smsc47m1_device_add(address, &sio_data);
         if (err)
-                goto exit;
+                return err;
 
         err = platform_driver_probe(&smsc47m1_driver, smsc47m1_probe);
         if (err)
@@ -955,7 +957,6 @@ static int __init sm_smsc47m1_init(void)
 exit_device:
         platform_device_unregister(pdev);
         smsc47m1_restore(&sio_data);
-exit:
         return err;
 }
 
diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c
index bba81216b4db..bf984b6dc477 100644
--- a/drivers/of/gpio.c
+++ b/drivers/of/gpio.c
@@ -140,7 +140,7 @@ int of_gpio_simple_xlate(struct gpio_chip *gc,
         if (WARN_ON(gpiospec->args_count < gc->of_gpio_n_cells))
                 return -EINVAL;
 
-        if (gpiospec->args[0] > gc->ngpio)
+        if (gpiospec->args[0] >= gc->ngpio)
                 return -EINVAL;
 
         if (flags)
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 31bfba805cf4..9b2901feaf78 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -653,7 +653,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
                         dev_dbg(sdev, "Couldn't DMA map a %d bytes RX buffer\n",
                                                                 rx_buf_count);
                         if (t->tx_buf)
-                                dma_unmap_single(NULL, t->tx_dma, t->len,
+                                dma_unmap_single(&spi->dev, t->tx_dma, t->len,
                                                                 DMA_TO_DEVICE);
                         return -ENOMEM;
                 }
@@ -692,10 +692,10 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
         if (spicfg->io_type == SPI_IO_TYPE_DMA) {
 
                 if (t->tx_buf)
-                        dma_unmap_single(NULL, t->tx_dma, t->len,
+                        dma_unmap_single(&spi->dev, t->tx_dma, t->len,
                                                                 DMA_TO_DEVICE);
 
-                dma_unmap_single(NULL, t->rx_dma, rx_buf_count,
+                dma_unmap_single(&spi->dev, t->rx_dma, rx_buf_count,
                                                         DMA_FROM_DEVICE);
 
                 clear_io_bits(dspi->base + SPIINT, SPIINT_DMA_REQ_EN);
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 24cacff57786..5f748c0d96bd 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -139,10 +139,12 @@ static void fsl_spi_change_mode(struct spi_device *spi)
 static void fsl_spi_chipselect(struct spi_device *spi, int value)
 {
         struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(spi->master);
-        struct fsl_spi_platform_data *pdata = spi->dev.parent->platform_data;
+        struct fsl_spi_platform_data *pdata;
         bool pol = spi->mode & SPI_CS_HIGH;
         struct spi_mpc8xxx_cs   *cs = spi->controller_state;
 
+        pdata = spi->dev.parent->parent->platform_data;
+
         if (value == BITBANG_CS_INACTIVE) {
                 if (pdata->cs_control)
                         pdata->cs_control(spi, !pol);
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 31054e3de4c1..570f22053be8 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -83,7 +83,7 @@ struct spi_imx_data {
         struct spi_bitbang bitbang;
 
         struct completion xfer_done;
-        void *base;
+        void __iomem *base;
         int irq;
         struct clk *clk;
         unsigned long spi_clk;
@@ -766,8 +766,12 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
         }
 
         ret = of_property_read_u32(np, "fsl,spi-num-chipselects", &num_cs);
-        if (ret < 0)
-                num_cs = mxc_platform_info->num_chipselect;
+        if (ret < 0) {
+                if (mxc_platform_info)
+                        num_cs = mxc_platform_info->num_chipselect;
+                else
+                        return ret;
+        }
 
         master = spi_alloc_master(&pdev->dev,
                         sizeof(struct spi_imx_data) + sizeof(int) * num_cs);
@@ -784,7 +788,7 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
 
         for (i = 0; i < master->num_chipselect; i++) {
                 int cs_gpio = of_get_named_gpio(np, "cs-gpios", i);
-                if (cs_gpio < 0)
+                if (cs_gpio < 0 && mxc_platform_info)
                         cs_gpio = mxc_platform_info->chipselect[i];
 
                 spi_imx->chipselect[i] = cs_gpio;
diff --git a/include/linux/amba/pl022.h b/include/linux/amba/pl022.h
index b8c51124ed19..76dd1b199a1b 100644
--- a/include/linux/amba/pl022.h
+++ b/include/linux/amba/pl022.h
@@ -25,6 +25,8 @@
 #ifndef _SSP_PL022_H
 #define _SSP_PL022_H
 
+#include <linux/types.h>
+
 /**
  * whether SSP is in loopback mode or not
  */