From 6b330e7d8794021e2e671d9adc792b0838748b28 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 13 Apr 2012 11:56:22 -0700
Subject: [PATCH] --- yaml --- r: 299182 b: refs/heads/master c:
 9e0daff30fd7ecf698e5d20b0fa7f851e427cca5 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/sparc/kernel/ds.c           |  2 +-
 trunk/drivers/gpio/Kconfig             |  2 +-
 trunk/drivers/gpio/gpio-adp5588.c      |  2 +-
 trunk/drivers/gpio/gpio-samsung.c      | 16 ++++++++--------
 trunk/drivers/gpio/gpio-sodaville.c    | 23 +++++++++++++----------
 trunk/drivers/hwmon/acpi_power_meter.c |  1 -
 trunk/drivers/hwmon/pmbus/pmbus_core.c | 17 +++++++++--------
 trunk/drivers/hwmon/smsc47b397.c       | 14 ++++++--------
 trunk/drivers/hwmon/smsc47m1.c         | 19 +++++++++----------
 trunk/drivers/of/gpio.c                |  2 +-
 trunk/drivers/spi/spi-davinci.c        |  6 +++---
 trunk/drivers/spi/spi-fsl-spi.c        |  4 +---
 trunk/drivers/spi/spi-imx.c            | 12 ++++--------
 trunk/include/linux/amba/pl022.h       |  2 --
 15 files changed, 58 insertions(+), 66 deletions(-)

diff --git a/[refs] b/[refs]
index b6781a9f8eb8..1a80c7a7fdd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e1173399d09aa7ab5db613911e38700b2307ece
+refs/heads/master: 9e0daff30fd7ecf698e5d20b0fa7f851e427cca5
diff --git a/trunk/arch/sparc/kernel/ds.c b/trunk/arch/sparc/kernel/ds.c
index fea13c7b1aee..b93c2c9ccb1d 100644
--- a/trunk/arch/sparc/kernel/ds.c
+++ b/trunk/arch/sparc/kernel/ds.c
@@ -1264,4 +1264,4 @@ static int __init ds_init(void)
 	return vio_register_driver(&ds_driver);
 }
 
-subsys_initcall(ds_init);
+fs_initcall(ds_init);
diff --git a/trunk/drivers/gpio/Kconfig b/trunk/drivers/gpio/Kconfig
index e03653d69357..edadbdad31d0 100644
--- a/trunk/drivers/gpio/Kconfig
+++ b/trunk/drivers/gpio/Kconfig
@@ -430,7 +430,7 @@ config GPIO_ML_IOH
 
 config GPIO_SODAVILLE
 	bool "Intel Sodaville GPIO support"
-	depends on X86 && PCI && OF
+	depends on X86 && PCI && OF && BROKEN
 	select GPIO_GENERIC
 	select GENERIC_IRQ_CHIP
 	help
diff --git a/trunk/drivers/gpio/gpio-adp5588.c b/trunk/drivers/gpio/gpio-adp5588.c
index ae5d7f12ce66..9ad1703d1408 100644
--- a/trunk/drivers/gpio/gpio-adp5588.c
+++ b/trunk/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, bit = 0; bank <= ADP5588_BANK(ADP5588_MAXGPIO);
+		for (bank = 0; bank <= ADP5588_BANK(ADP5588_MAXGPIO);
 			bank++, bit = 0) {
 			pending = dev->irq_stat[bank] & dev->irq_mask[bank];
 
diff --git a/trunk/drivers/gpio/gpio-samsung.c b/trunk/drivers/gpio/gpio-samsung.c
index 19d6fc0229c3..46277877b7ec 100644
--- a/trunk/drivers/gpio/gpio-samsung.c
+++ b/trunk/drivers/gpio/gpio-samsung.c
@@ -2382,8 +2382,8 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = {
 #endif
 };
 
-#ifdef CONFIG_ARCH_EXYNOS5
 static struct samsung_gpio_chip exynos5_gpios_1[] = {
+#ifdef CONFIG_ARCH_EXYNOS5
 	{
 		.chip	= {
 			.base	= EXYNOS5_GPA0(0),
@@ -2541,11 +2541,11 @@ static struct samsung_gpio_chip exynos5_gpios_1[] = {
 			.to_irq	= samsung_gpiolib_to_irq,
 		},
 	},
-};
 #endif
+};
 
-#ifdef CONFIG_ARCH_EXYNOS5
 static struct samsung_gpio_chip exynos5_gpios_2[] = {
+#ifdef CONFIG_ARCH_EXYNOS5
 	{
 		.chip	= {
 			.base	= EXYNOS5_GPE0(0),
@@ -2602,11 +2602,11 @@ static struct samsung_gpio_chip exynos5_gpios_2[] = {
 
 		},
 	},
-};
 #endif
+};
 
-#ifdef CONFIG_ARCH_EXYNOS5
 static struct samsung_gpio_chip exynos5_gpios_3[] = {
+#ifdef CONFIG_ARCH_EXYNOS5
 	{
 		.chip	= {
 			.base	= EXYNOS5_GPV0(0),
@@ -2638,11 +2638,11 @@ static struct samsung_gpio_chip exynos5_gpios_3[] = {
 			.label	= "GPV4",
 		},
 	},
-};
 #endif
+};
 
-#ifdef CONFIG_ARCH_EXYNOS5
 static struct samsung_gpio_chip exynos5_gpios_4[] = {
+#ifdef CONFIG_ARCH_EXYNOS5
 	{
 		.chip	= {
 			.base	= EXYNOS5_GPZ(0),
@@ -2650,8 +2650,8 @@ static struct samsung_gpio_chip exynos5_gpios_4[] = {
 			.label	= "GPZ",
 		},
 	},
-};
 #endif
+};
 
 
 #if defined(CONFIG_ARCH_EXYNOS) && defined(CONFIG_OF)
diff --git a/trunk/drivers/gpio/gpio-sodaville.c b/trunk/drivers/gpio/gpio-sodaville.c
index 031e5d24837d..9ba15d31d242 100644
--- a/trunk/drivers/gpio/gpio-sodaville.c
+++ b/trunk/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,9 +51,10 @@ 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 (d->hwirq < 8)
+	if (irq_offs < 8)
 		type_reg = sd->gpio_pub_base + GPIT1R0;
 	else
 		type_reg = sd->gpio_pub_base + GPIT1R1;
@@ -62,11 +63,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 * (d->hwirq % 8));
+		reg &= ~BIT(4 * (irq_offs % 8));
 		break;
 
 	case IRQ_TYPE_LEVEL_LOW:
-		reg |= BIT(4 * (d->hwirq % 8));
+		reg |= BIT(4 * (irq_offs % 8));
 		break;
 
 	default:
@@ -90,7 +91,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(irq_find_mapping(sd->id, irq_bit));
+		generic_handle_irq(sd->irq_base + irq_bit);
 	}
 
 	return IRQ_HANDLED;
@@ -126,7 +127,7 @@ static int sdv_xlate(struct irq_domain *h, struct device_node *node,
 }
 
 static struct irq_domain_ops irq_domain_sdv_ops = {
-	.xlate = sdv_xlate,
+	.dt_translate	= sdv_xlate,
 };
 
 static __devinit int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,
@@ -148,6 +149,10 @@ 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
@@ -174,10 +179,7 @@ static __devinit int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,
 			IRQ_GC_INIT_MASK_CACHE, IRQ_NOREQUEST,
 			IRQ_LEVEL | IRQ_NOPROBE);
 
-	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;
+	irq_domain_add(&sd->id);
 	return 0;
 out_free_irq:
 	free_irq(pdev->irq, sd);
@@ -258,6 +260,7 @@ 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/trunk/drivers/hwmon/acpi_power_meter.c b/trunk/drivers/hwmon/acpi_power_meter.c
index 9140236a0182..145f13580ff0 100644
--- a/trunk/drivers/hwmon/acpi_power_meter.c
+++ b/trunk/drivers/hwmon/acpi_power_meter.c
@@ -391,7 +391,6 @@ static ssize_t show_str(struct device *dev,
 		break;
 	default:
 		BUG();
-		val = "";
 	}
 
 	return sprintf(buf, "%s\n", val);
diff --git a/trunk/drivers/hwmon/pmbus/pmbus_core.c b/trunk/drivers/hwmon/pmbus/pmbus_core.c
index 29b319db573e..be51037363c8 100644
--- a/trunk/drivers/hwmon/pmbus/pmbus_core.c
+++ b/trunk/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)
+static int pmbus_get_boolean(struct pmbus_data *data, int index, int *val)
 {
 	u8 s1 = (index >> 24) & 0xff;
 	u8 s2 = (index >> 16) & 0xff;
 	u8 reg = (index >> 8) & 0xff;
 	u8 mask = index & 0xff;
-	int ret, status;
+	int status;
 	u8 regval;
 
 	status = data->status[reg];
@@ -725,7 +725,7 @@ static int pmbus_get_boolean(struct pmbus_data *data, int index)
 
 	regval = status & mask;
 	if (!s1 && !s2)
-		ret = !!regval;
+		*val = !!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)
 
 		v1 = pmbus_reg2data(data, sensor1);
 		v2 = pmbus_reg2data(data, sensor2);
-		ret = !!(regval && v1 >= v2);
+		*val = !!(regval && v1 >= v2);
 	}
-	return ret;
+	return 0;
 }
 
 static ssize_t pmbus_show_boolean(struct device *dev,
@@ -750,10 +750,11 @@ 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;
 
-	val = pmbus_get_boolean(data, attr->index);
-	if (val < 0)
-		return val;
+	err = pmbus_get_boolean(data, attr->index, &val);
+	if (err)
+		return err;
 	return snprintf(buf, PAGE_SIZE, "%d\n", val);
 }
 
diff --git a/trunk/drivers/hwmon/smsc47b397.c b/trunk/drivers/hwmon/smsc47b397.c
index c5f6be478bad..d3b778da3f86 100644
--- a/trunk/drivers/hwmon/smsc47b397.c
+++ b/trunk/drivers/hwmon/smsc47b397.c
@@ -343,11 +343,10 @@ static int __init smsc47b397_device_add(unsigned short address)
 	return err;
 }
 
-static int __init smsc47b397_find(void)
+static int __init smsc47b397_find(unsigned short *addr)
 {
 	u8 id, rev;
 	char *name;
-	unsigned short addr;
 
 	superio_enter();
 	id = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);
@@ -371,14 +370,14 @@ static int __init smsc47b397_find(void)
 	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 addr;
+	return 0;
 }
 
 static int __init smsc47b397_init(void)
@@ -386,10 +385,9 @@ static int __init smsc47b397_init(void)
 	unsigned short address;
 	int ret;
 
-	ret = smsc47b397_find();
-	if (ret < 0)
+	ret = smsc47b397_find(&address);
+	if (ret)
 		return ret;
-	address = ret;
 
 	ret = platform_driver_register(&smsc47b397_driver);
 	if (ret)
diff --git a/trunk/drivers/hwmon/smsc47m1.c b/trunk/drivers/hwmon/smsc47m1.c
index b5aa38dd7ab9..c590c1469793 100644
--- a/trunk/drivers/hwmon/smsc47m1.c
+++ b/trunk/drivers/hwmon/smsc47m1.c
@@ -491,10 +491,10 @@ static const struct attribute_group smsc47m1_group = {
 	.attrs = smsc47m1_attributes,
 };
 
-static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data)
+static int __init smsc47m1_find(unsigned short *addr,
+				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(struct smsc47m1_sio_data *sio_data)
 	}
 
 	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(struct smsc47m1_sio_data *sio_data)
 	}
 
 	superio_exit();
-	return addr;
+	return 0;
 }
 
 /* Restore device to its initial state */
@@ -938,15 +938,13 @@ static int __init sm_smsc47m1_init(void)
 	unsigned short address;
 	struct smsc47m1_sio_data sio_data;
 
-	err = smsc47m1_find(&sio_data);
-	if (err < 0)
-		return err;
-	address = err;
+	if (smsc47m1_find(&address, &sio_data))
+		return -ENODEV;
 
 	/* Sets global pdev as a side effect */
 	err = smsc47m1_device_add(address, &sio_data);
 	if (err)
-		return err;
+		goto exit;
 
 	err = platform_driver_probe(&smsc47m1_driver, smsc47m1_probe);
 	if (err)
@@ -957,6 +955,7 @@ static int __init sm_smsc47m1_init(void)
 exit_device:
 	platform_device_unregister(pdev);
 	smsc47m1_restore(&sio_data);
+exit:
 	return err;
 }
 
diff --git a/trunk/drivers/of/gpio.c b/trunk/drivers/of/gpio.c
index bf984b6dc477..bba81216b4db 100644
--- a/trunk/drivers/of/gpio.c
+++ b/trunk/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/trunk/drivers/spi/spi-davinci.c b/trunk/drivers/spi/spi-davinci.c
index 9b2901feaf78..31bfba805cf4 100644
--- a/trunk/drivers/spi/spi-davinci.c
+++ b/trunk/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(&spi->dev, t->tx_dma, t->len,
+				dma_unmap_single(NULL, 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(&spi->dev, t->tx_dma, t->len,
+			dma_unmap_single(NULL, t->tx_dma, t->len,
 								DMA_TO_DEVICE);
 
-		dma_unmap_single(&spi->dev, t->rx_dma, rx_buf_count,
+		dma_unmap_single(NULL, t->rx_dma, rx_buf_count,
 							DMA_FROM_DEVICE);
 
 		clear_io_bits(dspi->base + SPIINT, SPIINT_DMA_REQ_EN);
diff --git a/trunk/drivers/spi/spi-fsl-spi.c b/trunk/drivers/spi/spi-fsl-spi.c
index 5f748c0d96bd..24cacff57786 100644
--- a/trunk/drivers/spi/spi-fsl-spi.c
+++ b/trunk/drivers/spi/spi-fsl-spi.c
@@ -139,12 +139,10 @@ 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;
+	struct fsl_spi_platform_data *pdata = spi->dev.parent->platform_data;
 	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/trunk/drivers/spi/spi-imx.c b/trunk/drivers/spi/spi-imx.c
index 570f22053be8..31054e3de4c1 100644
--- a/trunk/drivers/spi/spi-imx.c
+++ b/trunk/drivers/spi/spi-imx.c
@@ -83,7 +83,7 @@ struct spi_imx_data {
 	struct spi_bitbang bitbang;
 
 	struct completion xfer_done;
-	void __iomem *base;
+	void *base;
 	int irq;
 	struct clk *clk;
 	unsigned long spi_clk;
@@ -766,12 +766,8 @@ 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) {
-		if (mxc_platform_info)
-			num_cs = mxc_platform_info->num_chipselect;
-		else
-			return ret;
-	}
+	if (ret < 0)
+		num_cs = mxc_platform_info->num_chipselect;
 
 	master = spi_alloc_master(&pdev->dev,
 			sizeof(struct spi_imx_data) + sizeof(int) * num_cs);
@@ -788,7 +784,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 && mxc_platform_info)
+		if (cs_gpio < 0)
 			cs_gpio = mxc_platform_info->chipselect[i];
 
 		spi_imx->chipselect[i] = cs_gpio;
diff --git a/trunk/include/linux/amba/pl022.h b/trunk/include/linux/amba/pl022.h
index 76dd1b199a1b..b8c51124ed19 100644
--- a/trunk/include/linux/amba/pl022.h
+++ b/trunk/include/linux/amba/pl022.h
@@ -25,8 +25,6 @@
 #ifndef _SSP_PL022_H
 #define _SSP_PL022_H
 
-#include <linux/types.h>
-
 /**
  * whether SSP is in loopback mode or not
  */