From mboxrd@z Thu Jan 1 00:00:00 1970 From: Finn Thain Subject: [PATCH 2/13] mac68k: rework SWIM platform device Date: Wed, 4 Nov 2009 00:39:56 +1100 (EST) Message-ID: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: Received: from www.telegraphics.com.au ([204.15.192.19]:39878 "EHLO mail.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753372AbZKCNjw (ORCPT ); Tue, 3 Nov 2009 08:39:52 -0500 Sender: linux-m68k-owner@vger.kernel.org List-Id: linux-m68k@vger.kernel.org To: Geert Uytterhoeven Cc: Laurent Vivier , linux-m68k@vger.kernel.org Adjust the platform device code to conform with the code style used in the rest of this patch series. No need to name resources nor to register devices which are not applicable. Signed-off-by: Finn Thain --- arch/m68k/mac/config.c | 35 ++++++++++++++++------------------- drivers/block/swim.c | 4 ++-- 2 files changed, 18 insertions(+), 21 deletions(-) Index: linux-2.6.31/arch/m68k/mac/config.c =================================================================== --- linux-2.6.31.orig/arch/m68k/mac/config.c 2009-11-03 03:23:40.000000000 +1100 +++ linux-2.6.31/arch/m68k/mac/config.c 2009-11-03 03:23:41.000000000 +1100 @@ -44,10 +44,6 @@ #include #include -/* platform device info */ - -#define SWIM_IO_SIZE 0x2000 /* SWIM IO resource size */ - /* Mac bootinfo struct */ struct mac_booter_data mac_bi_data; @@ -862,23 +858,23 @@ static void mac_get_model(char *str) strcat(str, macintosh_config->name); } -static struct resource swim_resources[1]; +static struct resource swim_rsrc = { .flags = IORESOURCE_MEM }; -static struct platform_device swim_device = { +static struct platform_device swim_pdev = { .name = "swim", .id = -1, - .num_resources = ARRAY_SIZE(swim_resources), - .resource = swim_resources, -}; - -static struct platform_device *mac_platform_devices[] __initdata = { - &swim_device + .num_resources = 1, + .resource = &swim_rsrc, }; int __init mac_platform_init(void) { u8 *swim_base; + /* + * Floppy device + */ + switch (macintosh_config->floppy_type) { case MAC_FLOPPY_SWIM_ADDR1: swim_base = (u8 *)(VIA1_BASE + 0x1E000); @@ -887,16 +883,17 @@ int __init mac_platform_init(void) swim_base = (u8 *)(VIA1_BASE + 0x16000); break; default: - return 0; + swim_base = NULL; + break; } - swim_resources[0].name = "swim-regs"; - swim_resources[0].start = (resource_size_t)swim_base; - swim_resources[0].end = (resource_size_t)(swim_base + SWIM_IO_SIZE); - swim_resources[0].flags = IORESOURCE_MEM; + if (swim_base) { + swim_rsrc.start = (resource_size_t) swim_base, + swim_rsrc.end = (resource_size_t) swim_base + 0x2000, + platform_device_register(&swim_pdev); + } - return platform_add_devices(mac_platform_devices, - ARRAY_SIZE(mac_platform_devices)); + return 0; } arch_initcall(mac_platform_init); Index: linux-2.6.31/drivers/block/swim.c =================================================================== --- linux-2.6.31.orig/drivers/block/swim.c 2009-11-03 03:23:24.000000000 +1100 +++ linux-2.6.31/drivers/block/swim.c 2009-11-03 03:23:41.000000000 +1100 @@ -864,7 +864,7 @@ static int __devinit swim_probe(struct p struct swim_priv *swd; int ret; - res = platform_get_resource_byname(dev, IORESOURCE_MEM, "swim-regs"); + res = platform_get_resource(dev, IORESOURCE_MEM, 0); if (!res) { ret = -ENODEV; goto out; @@ -942,7 +942,7 @@ static int __devexit swim_remove(struct iounmap(swd->base); - res = platform_get_resource_byname(dev, IORESOURCE_MEM, "swim-regs"); + res = platform_get_resource(dev, IORESOURCE_MEM, 0); if (res) release_mem_region(res->start, resource_size(res));