1 files changed, 19 insertions, 25 deletions

diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.c b/arch/arm/mach-omap2/gpmc-smsc911x.c
index 703f150dd01d..997033129d26 100644
--- a/arch/arm/mach-omap2/gpmc-smsc911x.c
+++ b/arch/arm/mach-omap2/gpmc-smsc911x.c
@@ -10,6 +10,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#define pr_fmt(fmt) "%s: " fmt, __func__
 
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
@@ -30,7 +31,7 @@ static struct resource gpmc_smsc911x_resources[] = {
                 .flags          = IORESOURCE_MEM,
         },
         [1] = {
-                .flags          = IORESOURCE_IRQ,
+                .flags          = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
         },
 };
 
@@ -41,16 +42,6 @@ static struct smsc911x_platform_config gpmc_smsc911x_config = {
         .flags          = SMSC911X_USE_16BIT,
 };
 
-static struct platform_device gpmc_smsc911x_device = {
-        .name           = "smsc911x",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(gpmc_smsc911x_resources),
-        .resource       = gpmc_smsc911x_resources,
-        .dev            = {
-                .platform_data = &gpmc_smsc911x_config,
-        },
-};
-
 /*
  * Initialize smsc911x device connected to the GPMC. Note that we
  * assume that pin multiplexing is done in the board-*.c file,
@@ -58,46 +49,49 @@ static struct platform_device gpmc_smsc911x_device = {
  */
 void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data)
 {
+        struct platform_device *pdev;
         unsigned long cs_mem_base;
         int ret;
 
         gpmc_cfg = board_data;
 
         if (gpmc_cs_request(gpmc_cfg->cs, SZ_16M, &cs_mem_base) < 0) {
-                printk(KERN_ERR "Failed to request GPMC mem for smsc911x\n");
+                pr_err("Failed to request GPMC mem region\n");
                 return;
         }
 
         gpmc_smsc911x_resources[0].start = cs_mem_base + 0x0;
         gpmc_smsc911x_resources[0].end = cs_mem_base + 0xff;
 
-        if (gpio_request(gpmc_cfg->gpio_irq, "smsc911x irq") < 0) {
-                printk(KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n",
-                                gpmc_cfg->gpio_irq);
+        if (gpio_request_one(gpmc_cfg->gpio_irq, GPIOF_IN, "smsc911x irq")) {
+                pr_err("Failed to request IRQ GPIO%d\n", gpmc_cfg->gpio_irq);
                 goto free1;
         }
 
-        gpio_direction_input(gpmc_cfg->gpio_irq);
         gpmc_smsc911x_resources[1].start = gpio_to_irq(gpmc_cfg->gpio_irq);
-        gpmc_smsc911x_resources[1].flags |=
-                                        (gpmc_cfg->flags & IRQF_TRIGGER_MASK);
 
         if (gpio_is_valid(gpmc_cfg->gpio_reset)) {
-                ret = gpio_request(gpmc_cfg->gpio_reset, "smsc911x reset");
+                ret = gpio_request_one(gpmc_cfg->gpio_reset,
+                                       GPIOF_OUT_INIT_HIGH, "smsc911x reset");
                 if (ret) {
-                        printk(KERN_ERR "Failed to request GPIO%d for smsc911x reset\n",
-                                        gpmc_cfg->gpio_reset);
+                        pr_err("Failed to request reset GPIO%d\n",
+                               gpmc_cfg->gpio_reset);
                         goto free2;
                 }
 
-                gpio_direction_output(gpmc_cfg->gpio_reset, 1);
                 gpio_set_value(gpmc_cfg->gpio_reset, 0);
                 msleep(100);
                 gpio_set_value(gpmc_cfg->gpio_reset, 1);
         }
 
-        if (platform_device_register(&gpmc_smsc911x_device) < 0) {
-                printk(KERN_ERR "Unable to register smsc911x device\n");
+        if (gpmc_cfg->flags)
+                gpmc_smsc911x_config.flags = gpmc_cfg->flags;
+
+        pdev = platform_device_register_resndata(NULL, "smsc911x", gpmc_cfg->id,
+                 gpmc_smsc911x_resources, ARRAY_SIZE(gpmc_smsc911x_resources),
+                 &gpmc_smsc911x_config, sizeof(gpmc_smsc911x_config));
+        if (!pdev) {
+                pr_err("Unable to register platform device\n");
                 gpio_free(gpmc_cfg->gpio_reset);
                 goto free2;
         }
@@ -109,5 +103,5 @@ free2:
 free1:
         gpmc_cs_free(gpmc_cfg->cs);
 
-        printk(KERN_ERR "Could not initialize smsc911x\n");
+        pr_err("Could not initialize smsc911x device\n");
 }