ARM: sa11x0: convert set_xxx_data() to register_xxx()

Only register devices if we have platform data for those which require
platform data.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 18 insertions, 13 deletions

diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index 23cfdd593954..9faea1511c1f 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -162,6 +162,17 @@ static void sa1100_power_off(void)
         PMCR = PMCR_SF;
 }
 
+static void sa11x0_register_device(struct platform_device *dev, void *data)
+{
+        int err;
+        dev->dev.platform_data = data;
+        err = platform_device_register(dev);
+        if (err)
+                printk(KERN_ERR "Unable to register device %s: %d\n",
+                        dev->name, err);
+}
+
+
 static struct resource sa11x0udc_resources[] = {
         [0] = {
                 .start  = 0x80000000,
@@ -234,9 +245,9 @@ static struct platform_device sa11x0mcp_device = {
         .resource       = sa11x0mcp_resources,
 };
 
-void sa11x0_set_mcp_data(struct mcp_plat_data *data)
+void sa11x0_register_mcp(struct mcp_plat_data *data)
 {
-        sa11x0mcp_device.dev.platform_data = data;
+        sa11x0_register_device(&sa11x0mcp_device, data);
 }
 
 static struct resource sa11x0ssp_resources[] = {
@@ -293,13 +304,13 @@ static struct platform_device sa11x0mtd_device = {
         .id             = -1,
 };
 
-void sa11x0_set_flash_data(struct flash_platform_data *flash,
-                           struct resource *res, int nr)
+void sa11x0_register_mtd(struct flash_platform_data *flash,
+                         struct resource *res, int nr)
 {
         flash->name = "sa1100";
-        sa11x0mtd_device.dev.platform_data = flash;
         sa11x0mtd_device.resource = res;
         sa11x0mtd_device.num_resources = nr;
+        sa11x0_register_device(&sa11x0mtd_device, flash);
 }
 
 static struct resource sa11x0ir_resources[] = {
@@ -329,9 +340,9 @@ static struct platform_device sa11x0ir_device = {
         .resource       = sa11x0ir_resources,
 };
 
-void sa11x0_set_irda_data(struct irda_platform_data *irda)
+void sa11x0_register_irda(struct irda_platform_data *irda)
 {
-        sa11x0ir_device.dev.platform_data = irda;
+        sa11x0_register_device(&sa11x0ir_device, irda);
 }
 
 static struct platform_device sa11x0rtc_device = {
@@ -343,21 +354,15 @@ static struct platform_device *sa11x0_devices[] __initdata = {
         &sa11x0udc_device,
         &sa11x0uart1_device,
         &sa11x0uart3_device,
-        &sa11x0mcp_device,
         &sa11x0ssp_device,
         &sa11x0pcmcia_device,
         &sa11x0fb_device,
-        &sa11x0mtd_device,
         &sa11x0rtc_device,
 };
 
 static int __init sa1100_init(void)
 {
         pm_power_off = sa1100_power_off;
-
-        if (sa11x0ir_device.dev.platform_data)
-                platform_device_register(&sa11x0ir_device);
-
         return platform_add_devices(sa11x0_devices, ARRAY_SIZE(sa11x0_devices));
 }