Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull "ARM: SoC fixes: from Olof Johansson:
 "A bunch of fixes for regressions (and a few other problems) in
  3.4-rc1:

 - Fix for regression of mach/io.h cleanup on platforms with PCI or
   PCMCIA (adding back the include file on those for now)
 - AT91 fixes for usb and spi
 - smsc911x ethernet fixes for i.MX
 - smsc911x fixes for OMAP
 - gpio fixes for Tegra
 - A handful of build error and warning fixes for various platforms
 - cpufreq kconfig dependencies, build and lowlevel debug fixes for
   Samsung platforms

  In other words, more or less the regular collection of -rc1/2 type
  material.  A few of them, in particular the smsc911x for OMAP series,
  aren't technically regressions for 3.4, but they're valid fixes and
  we're still relatively early in the rc cycle so it seems appropriate
  to include them."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits)
  ARM: fix __io macro for PCMCIA
  ARM: EXYNOS: Fix compiler warning in dma.c file
  ARM: EXYNOS: fix ISO C90 warning
  ARM: OMAP2+: hwmod: Fix wrong SYSC_TYPE1_XXX_MASK bit definitions
  ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status
  ARM: OMAP2+: hwmod: Restore sysc after a reset
  ARM: OMAP2+: omap_hwmod: Allow io_ring wakeup configuration for all modules
  ARM: OMAP3: clock data: fill in some missing clockdomains
  ARM: OMAP4: clock data: Force a DPLL clkdm/pwrdm ON before a relock
  ARM: OMAP4: clock data: fix mult and div mask for USB_DPLL
  ARM: OMAP2+: powerdomain: Wait for powerdomain transition in pwrdm_state_switch()
  gpio: tegra: Iterate over the correct number of banks
  gpio: tegra: fix register address calculations for Tegra30
  EXYNOS: fix dependency for EXYNOS_CPUFREQ
  ARM: at91: dt: remove unit-address part for memory nodes
  ARM: at91: fix check of valid GPIO for SPI and USB
  USB: ehci-atmel: add needed of.h header file
  ARM: at91/NAND DT bindings: add comments
  ARM: at91/at91sam9x5.dtsi: fix NAND ale/cle in DT file
  USB: ohci-at91: trivial return code name change
  ...

5 files changed, 135 insertions, 107 deletions

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 32d790dd8180..ffbb44685915 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -51,9 +51,6 @@ config ARM_S5PV210_CPUFREQ
 config ARM_EXYNOS_CPUFREQ
         bool "SAMSUNG EXYNOS SoCs"
         depends on ARCH_EXYNOS
-        select ARM_EXYNOS4210_CPUFREQ if CPU_EXYNOS4210
-        select ARM_EXYNOS4X12_CPUFREQ if (SOC_EXYNOS4212 || SOC_EXYNOS4412)
-        select ARM_EXYNOS5250_CPUFREQ if SOC_EXYNOS5250
         default y
         help
           This adds the CPUFreq driver common part for Samsung
@@ -62,20 +59,19 @@ config ARM_EXYNOS_CPUFREQ
           If in doubt, say N.
 
 config ARM_EXYNOS4210_CPUFREQ
-        bool "Samsung EXYNOS4210"
-        depends on ARCH_EXYNOS
+        def_bool CPU_EXYNOS4210
         help
           This adds the CPUFreq driver for Samsung EXYNOS4210
           SoC (S5PV310 or S5PC210).
 
 config ARM_EXYNOS4X12_CPUFREQ
-        bool "Samsung EXYNOS4X12"
+        def_bool (SOC_EXYNOS4212 || SOC_EXYNOS4412)
         help
           This adds the CPUFreq driver for Samsung EXYNOS4X12
           SoC (EXYNOS4212 or EXYNOS4412).
 
 config ARM_EXYNOS5250_CPUFREQ
-        bool "Samsung EXYNOS5250"
+        def_bool SOC_EXYNOS5250
         help
           This adds the CPUFreq driver for Samsung EXYNOS5250
           SoC.
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 32de6707e3c4..12f349b3830d 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -22,7 +22,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
-#include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
 #include <linux/irqdomain.h>
@@ -37,7 +37,8 @@
 #define GPIO_PORT(x)            (((x) >> 3) & 0x3)
 #define GPIO_BIT(x)             ((x) & 0x7)
 
-#define GPIO_REG(x)             (GPIO_BANK(x) * 0x80 + GPIO_PORT(x) * 4)
+#define GPIO_REG(x)             (GPIO_BANK(x) * tegra_gpio_bank_stride + \
+                                        GPIO_PORT(x) * 4)
 
 #define GPIO_CNF(x)             (GPIO_REG(x) + 0x00)
 #define GPIO_OE(x)              (GPIO_REG(x) + 0x10)
@@ -48,12 +49,12 @@
 #define GPIO_INT_LVL(x)         (GPIO_REG(x) + 0x60)
 #define GPIO_INT_CLR(x)         (GPIO_REG(x) + 0x70)
 
-#define GPIO_MSK_CNF(x)         (GPIO_REG(x) + 0x800)
-#define GPIO_MSK_OE(x)          (GPIO_REG(x) + 0x810)
-#define GPIO_MSK_OUT(x)         (GPIO_REG(x) + 0X820)
-#define GPIO_MSK_INT_STA(x)     (GPIO_REG(x) + 0x840)
-#define GPIO_MSK_INT_ENB(x)     (GPIO_REG(x) + 0x850)
-#define GPIO_MSK_INT_LVL(x)     (GPIO_REG(x) + 0x860)
+#define GPIO_MSK_CNF(x)         (GPIO_REG(x) + tegra_gpio_upper_offset + 0x00)
+#define GPIO_MSK_OE(x)          (GPIO_REG(x) + tegra_gpio_upper_offset + 0x10)
+#define GPIO_MSK_OUT(x)         (GPIO_REG(x) + tegra_gpio_upper_offset + 0X20)
+#define GPIO_MSK_INT_STA(x)     (GPIO_REG(x) + tegra_gpio_upper_offset + 0x40)
+#define GPIO_MSK_INT_ENB(x)     (GPIO_REG(x) + tegra_gpio_upper_offset + 0x50)
+#define GPIO_MSK_INT_LVL(x)     (GPIO_REG(x) + tegra_gpio_upper_offset + 0x60)
 
 #define GPIO_INT_LVL_MASK               0x010101
 #define GPIO_INT_LVL_EDGE_RISING        0x000101
@@ -78,6 +79,8 @@ struct tegra_gpio_bank {
 static struct irq_domain *irq_domain;
 static void __iomem *regs;
 static u32 tegra_gpio_bank_count;
+static u32 tegra_gpio_bank_stride;
+static u32 tegra_gpio_upper_offset;
 static struct tegra_gpio_bank *tegra_gpio_banks;
 
 static inline void tegra_gpio_writel(u32 val, u32 reg)
@@ -333,6 +336,26 @@ static struct irq_chip tegra_gpio_irq_chip = {
 #endif
 };
 
+struct tegra_gpio_soc_config {
+        u32 bank_stride;
+        u32 upper_offset;
+};
+
+static struct tegra_gpio_soc_config tegra20_gpio_config = {
+        .bank_stride = 0x80,
+        .upper_offset = 0x800,
+};
+
+static struct tegra_gpio_soc_config tegra30_gpio_config = {
+        .bank_stride = 0x100,
+        .upper_offset = 0x80,
+};
+
+static struct of_device_id tegra_gpio_of_match[] __devinitdata = {
+        { .compatible = "nvidia,tegra30-gpio", .data = &tegra30_gpio_config },
+        { .compatible = "nvidia,tegra20-gpio", .data = &tegra20_gpio_config },
+        { },
+};
 
 /* This lock class tells lockdep that GPIO irqs are in a different
  * category than their parents, so it won't report false recursion.
@@ -341,6 +364,8 @@ static struct lock_class_key gpio_lock_class;
 
 static int __devinit tegra_gpio_probe(struct platform_device *pdev)
 {
+        const struct of_device_id *match;
+        struct tegra_gpio_soc_config *config;
         int irq_base;
         struct resource *res;
         struct tegra_gpio_bank *bank;
@@ -348,6 +373,15 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
         int i;
         int j;
 
+        match = of_match_device(tegra_gpio_of_match, &pdev->dev);
+        if (match)
+                config = (struct tegra_gpio_soc_config *)match->data;
+        else
+                config = &tegra20_gpio_config;
+
+        tegra_gpio_bank_stride = config->bank_stride;
+        tegra_gpio_upper_offset = config->upper_offset;
+
         for (;;) {
                 res = platform_get_resource(pdev, IORESOURCE_IRQ, tegra_gpio_bank_count);
                 if (!res)
@@ -402,7 +436,7 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        for (i = 0; i < 7; i++) {
+        for (i = 0; i < tegra_gpio_bank_count; i++) {
                 for (j = 0; j < 4; j++) {
                         int gpio = tegra_gpio_compose(i, j, 0);
                         tegra_gpio_writel(0x00, GPIO_INT_ENB(gpio));
@@ -441,11 +475,6 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id tegra_gpio_of_match[] __devinitdata = {
-        { .compatible = "nvidia,tegra20-gpio", },
-        { },
-};
-
 static struct platform_driver tegra_gpio_driver = {
         .driver         = {
                 .name   = "tegra-gpio",
@@ -485,7 +514,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused)
         int i;
         int j;
 
-        for (i = 0; i < 7; i++) {
+        for (i = 0; i < tegra_gpio_bank_count; i++) {
                 for (j = 0; j < 4; j++) {
                         int gpio = tegra_gpio_compose(i, j, 0);
                         seq_printf(s,
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 19f318ababa2..cf14c95a6700 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -13,6 +13,7 @@
 
 #include <linux/clk.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 
 /* interface and function clocks */
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index db8963f5fbce..09f597ad6e00 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -27,6 +27,10 @@
 #error "CONFIG_ARCH_AT91 must be defined."
 #endif
 
+#define valid_port(index)       ((index) >= 0 && (index) < AT91_MAX_USBH_PORTS)
+#define at91_for_each_port(index)       \
+                for ((index) = 0; (index) < AT91_MAX_USBH_PORTS; (index)++)
+
 /* interface and function clocks; sometimes also an AHB clock */
 static struct clk *iclk, *fclk, *hclk;
 static int clocked;
@@ -240,26 +244,26 @@ ohci_at91_start (struct usb_hcd *hcd)
 
 static void ohci_at91_usb_set_power(struct at91_usbh_data *pdata, int port, int enable)
 {
-        if (port < 0 || port >= 2)
+        if (!valid_port(port))
                 return;
 
         if (!gpio_is_valid(pdata->vbus_pin[port]))
                 return;
 
         gpio_set_value(pdata->vbus_pin[port],
-                       !pdata->vbus_pin_active_low[port] ^ enable);
+                       pdata->vbus_pin_active_low[port] ^ enable);
 }
 
 static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
 {
-        if (port < 0 || port >= 2)
+        if (!valid_port(port))
                 return -EINVAL;
 
         if (!gpio_is_valid(pdata->vbus_pin[port]))
                 return -EINVAL;
 
         return gpio_get_value(pdata->vbus_pin[port]) ^
-                !pdata->vbus_pin_active_low[port];
+                pdata->vbus_pin_active_low[port];
 }
 
 /*
@@ -271,9 +275,9 @@ static int ohci_at91_hub_status_data(struct usb_hcd *hcd, char *buf)
         int length = ohci_hub_status_data(hcd, buf);
         int port;
 
-        for (port = 0; port < ARRAY_SIZE(pdata->overcurrent_pin); port++) {
+        at91_for_each_port(port) {
                 if (pdata->overcurrent_changed[port]) {
-                        if (! length)
+                        if (!length)
                                 length = 1;
                         buf[0] |= 1 << (port + 1);
                 }
@@ -297,11 +301,17 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                 "ohci_at91_hub_control(%p,0x%04x,0x%04x,0x%04x,%p,%04x)\n",
                 hcd, typeReq, wValue, wIndex, buf, wLength);
 
+        wIndex--;
+
         switch (typeReq) {
         case SetPortFeature:
                 if (wValue == USB_PORT_FEAT_POWER) {
                         dev_dbg(hcd->self.controller, "SetPortFeat: POWER\n");
-                        ohci_at91_usb_set_power(pdata, wIndex - 1, 1);
+                        if (valid_port(wIndex)) {
+                                ohci_at91_usb_set_power(pdata, wIndex, 1);
+                                ret = 0;
+                        }
+
                         goto out;
                 }
                 break;
@@ -312,9 +322,9 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         dev_dbg(hcd->self.controller,
                                 "ClearPortFeature: C_OVER_CURRENT\n");
 
-                        if (wIndex == 1 || wIndex == 2) {
-                                pdata->overcurrent_changed[wIndex-1] = 0;
-                                pdata->overcurrent_status[wIndex-1] = 0;
+                        if (valid_port(wIndex)) {
+                                pdata->overcurrent_changed[wIndex] = 0;
+                                pdata->overcurrent_status[wIndex] = 0;
                         }
 
                         goto out;
@@ -323,9 +333,8 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         dev_dbg(hcd->self.controller,
                                 "ClearPortFeature: OVER_CURRENT\n");
 
-                        if (wIndex == 1 || wIndex == 2) {
-                                pdata->overcurrent_status[wIndex-1] = 0;
-                        }
+                        if (valid_port(wIndex))
+                                pdata->overcurrent_status[wIndex] = 0;
 
                         goto out;
 
@@ -333,15 +342,15 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         dev_dbg(hcd->self.controller,
                                 "ClearPortFeature: POWER\n");
 
-                        if (wIndex == 1 || wIndex == 2) {
-                                ohci_at91_usb_set_power(pdata, wIndex - 1, 0);
+                        if (valid_port(wIndex)) {
+                                ohci_at91_usb_set_power(pdata, wIndex, 0);
                                 return 0;
                         }
                 }
                 break;
         }
 
-        ret = ohci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
+        ret = ohci_hub_control(hcd, typeReq, wValue, wIndex + 1, buf, wLength);
         if (ret)
                 goto out;
 
@@ -377,18 +386,15 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
 
                 dev_dbg(hcd->self.controller, "GetPortStatus(%d)\n", wIndex);
 
-                if (wIndex == 1 || wIndex == 2) {
-                        if (! ohci_at91_usb_get_power(pdata, wIndex-1)) {
+                if (valid_port(wIndex)) {
+                        if (!ohci_at91_usb_get_power(pdata, wIndex))
                                 *data &= ~cpu_to_le32(RH_PS_PPS);
-                        }
 
-                        if (pdata->overcurrent_changed[wIndex-1]) {
+                        if (pdata->overcurrent_changed[wIndex])
                                 *data |= cpu_to_le32(RH_PS_OCIC);
-                        }
 
-                        if (pdata->overcurrent_status[wIndex-1]) {
+                        if (pdata->overcurrent_status[wIndex])
                                 *data |= cpu_to_le32(RH_PS_POCI);
-                        }
                 }
         }
 
@@ -450,14 +456,14 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
 
         /* From the GPIO notifying the over-current situation, find
          * out the corresponding port */
-        for (port = 0; port < ARRAY_SIZE(pdata->overcurrent_pin); port++) {
+        at91_for_each_port(port) {
                 if (gpio_to_irq(pdata->overcurrent_pin[port]) == irq) {
                         gpio = pdata->overcurrent_pin[port];
                         break;
                 }
         }
 
-        if (port == ARRAY_SIZE(pdata->overcurrent_pin)) {
+        if (port == AT91_MAX_USBH_PORTS) {
                 dev_err(& pdev->dev, "overcurrent interrupt from unknown GPIO\n");
                 return IRQ_HANDLED;
         }
@@ -467,7 +473,7 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
         /* When notified of an over-current situation, disable power
            on the corresponding port, and mark this port in
            over-current. */
-        if (! val) {
+        if (!val) {
                 ohci_at91_usb_set_power(pdata, port, 0);
                 pdata->overcurrent_status[port]  = 1;
                 pdata->overcurrent_changed[port] = 1;
@@ -492,7 +498,7 @@ static u64 at91_ohci_dma_mask = DMA_BIT_MASK(32);
 static int __devinit ohci_at91_of_init(struct platform_device *pdev)
 {
         struct device_node *np = pdev->dev.of_node;
-        int i, ret, gpio;
+        int i, gpio;
         enum of_gpio_flags flags;
         struct at91_usbh_data   *pdata;
         u32 ports;
@@ -514,48 +520,17 @@ static int __devinit ohci_at91_of_init(struct platform_device *pdev)
         if (!of_property_read_u32(np, "num-ports", &ports))
                 pdata->ports = ports;
 
-        for (i = 0; i < 2; i++) {
+        at91_for_each_port(i) {
                 gpio = of_get_named_gpio_flags(np, "atmel,vbus-gpio", i, &flags);
                 pdata->vbus_pin[i] = gpio;
                 if (!gpio_is_valid(gpio))
                         continue;
                 pdata->vbus_pin_active_low[i] = flags & OF_GPIO_ACTIVE_LOW;
-                ret = gpio_request(gpio, "ohci_vbus");
-                if (ret) {
-                        dev_warn(&pdev->dev, "can't request vbus gpio %d", gpio);
-                        continue;
-                }
-                ret = gpio_direction_output(gpio, !(flags & OF_GPIO_ACTIVE_LOW) ^ 1);
-                if (ret)
-                        dev_warn(&pdev->dev, "can't put vbus gpio %d as output %d",
-                                 !(flags & OF_GPIO_ACTIVE_LOW) ^ 1, gpio);
         }
 
-        for (i = 0; i < 2; i++) {
-                gpio = of_get_named_gpio_flags(np, "atmel,oc-gpio", i, &flags);
-                pdata->overcurrent_pin[i] = gpio;
-                if (!gpio_is_valid(gpio))
-                        continue;
-                ret = gpio_request(gpio, "ohci_overcurrent");
-                if (ret) {
-                        dev_err(&pdev->dev, "can't request overcurrent gpio %d", gpio);
-                        continue;
-                }
-
-                ret = gpio_direction_input(gpio);
-                if (ret) {
-                        dev_err(&pdev->dev, "can't configure overcurrent gpio %d as input", gpio);
-                        continue;
-                }
-
-                ret = request_irq(gpio_to_irq(gpio),
-                                  ohci_hcd_at91_overcurrent_irq,
-                                  IRQF_SHARED, "ohci_overcurrent", pdev);
-                if (ret) {
-                        gpio_free(gpio);
-                        dev_warn(& pdev->dev, "cannot get GPIO IRQ for overcurrent\n");
-                }
-        }
+        at91_for_each_port(i)
+                pdata->overcurrent_pin[i] =
+                        of_get_named_gpio_flags(np, "atmel,oc-gpio", i, &flags);
 
         pdev->dev.platform_data = pdata;
 
@@ -574,35 +549,69 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
 {
         struct at91_usbh_data   *pdata;
         int                     i;
+        int                     gpio;
+        int                     ret;
 
-        i = ohci_at91_of_init(pdev);
-
-        if (i)
-                return i;
+        ret = ohci_at91_of_init(pdev);
+        if (ret)
+                return ret;
 
         pdata = pdev->dev.platform_data;
 
         if (pdata) {
-                for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
+                at91_for_each_port(i) {
                         if (!gpio_is_valid(pdata->vbus_pin[i]))
                                 continue;
-                        gpio_request(pdata->vbus_pin[i], "ohci_vbus");
+                        gpio = pdata->vbus_pin[i];
+
+                        ret = gpio_request(gpio, "ohci_vbus");
+                        if (ret) {
+                                dev_err(&pdev->dev,
+                                        "can't request vbus gpio %d\n", gpio);
+                                continue;
+                        }
+                        ret = gpio_direction_output(gpio,
+                                                !pdata->vbus_pin_active_low[i]);
+                        if (ret) {
+                                dev_err(&pdev->dev,
+                                        "can't put vbus gpio %d as output %d\n",
+                                        gpio, !pdata->vbus_pin_active_low[i]);
+                                gpio_free(gpio);
+                                continue;
+                        }
+
                         ohci_at91_usb_set_power(pdata, i, 1);
                 }
 
-                for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) {
-                        int ret;
-
+                at91_for_each_port(i) {
                         if (!gpio_is_valid(pdata->overcurrent_pin[i]))
                                 continue;
-                        gpio_request(pdata->overcurrent_pin[i], "ohci_overcurrent");
+                        gpio = pdata->overcurrent_pin[i];
+
+                        ret = gpio_request(gpio, "ohci_overcurrent");
+                        if (ret) {
+                                dev_err(&pdev->dev,
+                                        "can't request overcurrent gpio %d\n",
+                                        gpio);
+                                continue;
+                        }
+
+                        ret = gpio_direction_input(gpio);
+                        if (ret) {
+                                dev_err(&pdev->dev,
+                                        "can't configure overcurrent gpio %d as input\n",
+                                        gpio);
+                                gpio_free(gpio);
+                                continue;
+                        }
 
-                        ret = request_irq(gpio_to_irq(pdata->overcurrent_pin[i]),
+                        ret = request_irq(gpio_to_irq(gpio),
                                           ohci_hcd_at91_overcurrent_irq,
                                           IRQF_SHARED, "ohci_overcurrent", pdev);
                         if (ret) {
-                                gpio_free(pdata->overcurrent_pin[i]);
-                                dev_warn(& pdev->dev, "cannot get GPIO IRQ for overcurrent\n");
+                                gpio_free(gpio);
+                                dev_err(&pdev->dev,
+                                        "can't get gpio IRQ for overcurrent\n");
                         }
                 }
         }
@@ -617,14 +626,14 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
         int                     i;
 
         if (pdata) {
-                for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
+                at91_for_each_port(i) {
                         if (!gpio_is_valid(pdata->vbus_pin[i]))
                                 continue;
                         ohci_at91_usb_set_power(pdata, i, 0);
                         gpio_free(pdata->vbus_pin[i]);
                 }
 
-                for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) {
+                at91_for_each_port(i) {
                         if (!gpio_is_valid(pdata->overcurrent_pin[i]))
                                 continue;
                         free_irq(gpio_to_irq(pdata->overcurrent_pin[i]), pdev);
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index be20b5cbe26c..3a6d5419e3e3 100644
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -229,14 +229,7 @@ static struct locomo_driver poodle_lcd_driver = {
 
 static int __init locomolcd_init(void)
 {
-        int ret = locomo_driver_register(&poodle_lcd_driver);
-        if (ret)
-                return ret;
-
-#ifdef CONFIG_SA1100_COLLIE
-        sa1100fb_lcd_power = locomolcd_power;
-#endif
-        return 0;
+        return locomo_driver_register(&poodle_lcd_driver);
 }
 
 static void __exit locomolcd_exit(void)