2 files changed, 32 insertions, 23 deletions

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 4e0dcaef6eb2..c46dc65ec79a 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -814,12 +814,15 @@ static inline struct locomo *locomo_chip_driver(struct locomo_dev *ldev)
         return (struct locomo *)dev_get_drvdata(ldev->dev.parent);
 }
 
-void locomo_gpio_set_dir(struct locomo_dev *ldev, unsigned int bits, unsigned int dir)
+void locomo_gpio_set_dir(struct device *dev, unsigned int bits, unsigned int dir)
 {
-        struct locomo *lchip = locomo_chip_driver(ldev);
+        struct locomo *lchip = dev_get_drvdata(dev);
         unsigned long flags;
         unsigned int r;
 
+        if (!lchip)
+                return;
+
         spin_lock_irqsave(&lchip->lock, flags);
 
         r = locomo_readl(lchip->base + LOCOMO_GPD);
@@ -836,12 +839,15 @@ void locomo_gpio_set_dir(struct locomo_dev *ldev, unsigned int bits, unsigned in
         spin_unlock_irqrestore(&lchip->lock, flags);
 }
 
-unsigned int locomo_gpio_read_level(struct locomo_dev *ldev, unsigned int bits)
+int locomo_gpio_read_level(struct device *dev, unsigned int bits)
 {
-        struct locomo *lchip = locomo_chip_driver(ldev);
+        struct locomo *lchip = dev_get_drvdata(dev);
         unsigned long flags;
         unsigned int ret;
 
+        if (!lchip)
+                return -ENODEV;
+
         spin_lock_irqsave(&lchip->lock, flags);
         ret = locomo_readl(lchip->base + LOCOMO_GPL);
         spin_unlock_irqrestore(&lchip->lock, flags);
@@ -850,12 +856,15 @@ unsigned int locomo_gpio_read_level(struct locomo_dev *ldev, unsigned int bits)
         return ret;
 }
 
-unsigned int locomo_gpio_read_output(struct locomo_dev *ldev, unsigned int bits)
+int locomo_gpio_read_output(struct device *dev, unsigned int bits)
 {
-        struct locomo *lchip = locomo_chip_driver(ldev);
+        struct locomo *lchip = dev_get_drvdata(dev);
         unsigned long flags;
         unsigned int ret;
 
+        if (!lchip)
+                return -ENODEV;
+
         spin_lock_irqsave(&lchip->lock, flags);
         ret = locomo_readl(lchip->base + LOCOMO_GPO);
         spin_unlock_irqrestore(&lchip->lock, flags);
@@ -864,12 +873,15 @@ unsigned int locomo_gpio_read_output(struct locomo_dev *ldev, unsigned int bits)
         return ret;
 }
 
-void locomo_gpio_write(struct locomo_dev *ldev, unsigned int bits, unsigned int set)
+void locomo_gpio_write(struct device *dev, unsigned int bits, unsigned int set)
 {
-        struct locomo *lchip = locomo_chip_driver(ldev);
+        struct locomo *lchip = dev_get_drvdata(dev);
         unsigned long flags;
         unsigned int r;
 
+        if (!lchip)
+                return;
+
         spin_lock_irqsave(&lchip->lock, flags);
 
         r = locomo_readl(lchip->base + LOCOMO_GPO);
@@ -1058,9 +1070,9 @@ void locomo_frontlight_set(struct locomo_dev *dev, int duty, int vr, int bpwf)
         struct locomo *lchip = locomo_chip_driver(dev);
 
         if (vr)
-                locomo_gpio_write(dev, LOCOMO_GPIO_FL_VR, 1);
+                locomo_gpio_write(dev->dev.parent, LOCOMO_GPIO_FL_VR, 1);
         else
-                locomo_gpio_write(dev, LOCOMO_GPIO_FL_VR, 0);
+                locomo_gpio_write(dev->dev.parent, LOCOMO_GPIO_FL_VR, 0);
 
         spin_lock_irqsave(&lchip->lock, flags);
         locomo_writel(bpwf, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index a0dfa390e34b..6496eb645cee 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -91,30 +91,29 @@ static struct mcp_plat_data collie_mcp_data = {
 /*
  * low-level UART features.
  */
-static struct locomo_dev *uart_dev = NULL;
+struct platform_device collie_locomo_device;
 
 static void collie_uart_set_mctrl(struct uart_port *port, u_int mctrl)
 {
-        if (!uart_dev) return;
-
         if (mctrl & TIOCM_RTS)
-                locomo_gpio_write(uart_dev, LOCOMO_GPIO_RTS, 0);
+                locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_RTS, 0);
         else
-                locomo_gpio_write(uart_dev, LOCOMO_GPIO_RTS, 1);
+                locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_RTS, 1);
 
         if (mctrl & TIOCM_DTR)
-                locomo_gpio_write(uart_dev, LOCOMO_GPIO_DTR, 0);
+                locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_DTR, 0);
         else
-                locomo_gpio_write(uart_dev, LOCOMO_GPIO_DTR, 1);
+                locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_DTR, 1);
 }
 
 static u_int collie_uart_get_mctrl(struct uart_port *port)
 {
         int ret = TIOCM_CD;
         unsigned int r;
-        if (!uart_dev) return ret;
 
-        r = locomo_gpio_read_output(uart_dev, LOCOMO_GPIO_CTS & LOCOMO_GPIO_DSR);
+        r = locomo_gpio_read_output(&collie_locomo_device.dev, LOCOMO_GPIO_CTS & LOCOMO_GPIO_DSR);
+        if (r == -ENODEV)
+                return ret;
         if (r & LOCOMO_GPIO_CTS)
                 ret |= TIOCM_CTS;
         if (r & LOCOMO_GPIO_DSR)
@@ -130,13 +129,11 @@ static struct sa1100_port_fns collie_port_fns __initdata = {
 
 static int collie_uart_probe(struct locomo_dev *dev)
 {
-        uart_dev = dev;
         return 0;
 }
 
 static int collie_uart_remove(struct locomo_dev *dev)
 {
-        uart_dev = NULL;
         return 0;
 }
 
@@ -170,7 +167,7 @@ static struct resource locomo_resources[] = {
         },
 };
 
-static struct platform_device locomo_device = {
+struct platform_device collie_locomo_device = {
         .name           = "locomo",
         .id             = 0,
         .num_resources  = ARRAY_SIZE(locomo_resources),
@@ -178,7 +175,7 @@ static struct platform_device locomo_device = {
 };
 
 static struct platform_device *devices[] __initdata = {
-        &locomo_device,
+        &collie_locomo_device,
         &colliescoop_device,
 };