From 3c5327e660bc840deb82030062c91e469528dd94 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Thu, 20 Sep 2012 03:22:17 +0800 Subject: switch all platform_bus device/driver registering to platform_driver/device_register now register_driver and register_device are for bus only usage. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- arch/arm/boards/nhk8815/setup.c | 2 +- arch/arm/boards/pcm038/pcm970.c | 2 +- arch/arm/mach-imx/clocksource.c | 2 +- arch/arm/mach-imx/gpio.c | 2 +- arch/arm/mach-imx/iim.c | 2 +- arch/arm/mach-imx/include/mach/devices-imx51.h | 2 +- arch/arm/mach-imx/include/mach/devices-imx53.h | 2 +- arch/arm/mach-mxs/ocotp.c | 2 +- arch/arm/mach-omap/arch-omap.dox | 2 +- arch/arm/mach-omap/gpio.c | 3 +-- arch/nios2/boards/generic/generic.c | 2 +- arch/sandbox/board/board.c | 4 ++-- arch/sandbox/board/devices.c | 2 +- arch/sandbox/board/hostfile.c | 2 +- 14 files changed, 15 insertions(+), 16 deletions(-) (limited to 'arch') diff --git a/arch/arm/boards/nhk8815/setup.c b/arch/arm/boards/nhk8815/setup.c index b455afe689..7f93ecb196 100644 --- a/arch/arm/boards/nhk8815/setup.c +++ b/arch/arm/boards/nhk8815/setup.c @@ -94,7 +94,7 @@ static int nhk8815_devices_init(void) add_generic_device("smc91c111", DEVICE_ID_DYNAMIC, NULL, 0x34000300, 16, IORESOURCE_MEM, NULL); - register_device(&nhk8815_nand_device); + platform_device_register(&nhk8815_nand_device); armlinux_set_architecture(MACH_TYPE_NOMADIK); armlinux_set_bootparams((void *)(0x00000100)); diff --git a/arch/arm/boards/pcm038/pcm970.c b/arch/arm/boards/pcm038/pcm970.c index b2ed85f582..5834311aad 100644 --- a/arch/arm/boards/pcm038/pcm970.c +++ b/arch/arm/boards/pcm038/pcm970.c @@ -141,7 +141,7 @@ static void pcm970_ide_init(void) /* Make PCMCIA bank0 valid */ writel(readl(PCMCIA_POR(0)) | (1 << 29), PCMCIA_POR(0)); - register_device(&pcm970_ide_device); + platform_device_register(&pcm970_ide_device); } #endif diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c index 2c6f6a08e6..bd41e75888 100644 --- a/arch/arm/mach-imx/clocksource.c +++ b/arch/arm/mach-imx/clocksource.c @@ -163,7 +163,7 @@ static struct driver_d imx_gpt_driver = { static int imx_gpt_init(void) { - return register_driver(&imx_gpt_driver); + return platform_driver_register(&imx_gpt_driver); } coredevice_initcall(imx_gpt_init); diff --git a/arch/arm/mach-imx/gpio.c b/arch/arm/mach-imx/gpio.c index 268e598195..6c88948da0 100644 --- a/arch/arm/mach-imx/gpio.c +++ b/arch/arm/mach-imx/gpio.c @@ -201,7 +201,7 @@ static struct driver_d imx_gpio_driver = { static int imx_gpio_add(void) { - register_driver(&imx_gpio_driver); + platform_driver_register(&imx_gpio_driver); return 0; } coredevice_initcall(imx_gpio_add); diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c index 0da8ea062b..69ddc4d6a8 100644 --- a/arch/arm/mach-imx/iim.c +++ b/arch/arm/mach-imx/iim.c @@ -295,7 +295,7 @@ static struct driver_d imx_iim_driver = { static int imx_iim_init(void) { - register_driver(&imx_iim_driver); + platform_driver_register(&imx_iim_driver); return 0; } diff --git a/arch/arm/mach-imx/include/mach/devices-imx51.h b/arch/arm/mach-imx/include/mach/devices-imx51.h index 3d7ff72315..4b35c96e21 100644 --- a/arch/arm/mach-imx/include/mach/devices-imx51.h +++ b/arch/arm/mach-imx/include/mach/devices-imx51.h @@ -84,7 +84,7 @@ static inline struct device_d *imx51_add_nand(struct imx_nand_platform_data *pda dev->id = DEVICE_ID_DYNAMIC; dev->platform_data = pdata; - register_device(dev); + platform_device_register(dev); return dev; } diff --git a/arch/arm/mach-imx/include/mach/devices-imx53.h b/arch/arm/mach-imx/include/mach/devices-imx53.h index 0fc4b5cf02..54d7b27be1 100644 --- a/arch/arm/mach-imx/include/mach/devices-imx53.h +++ b/arch/arm/mach-imx/include/mach/devices-imx53.h @@ -78,7 +78,7 @@ static inline struct device_d *imx53_add_nand(struct imx_nand_platform_data *pda dev->id = DEVICE_ID_DYNAMIC; dev->platform_data = pdata; - register_device(dev); + platform_device_register(dev); return dev; } diff --git a/arch/arm/mach-mxs/ocotp.c b/arch/arm/mach-mxs/ocotp.c index 78244028b9..84f38b580f 100644 --- a/arch/arm/mach-mxs/ocotp.c +++ b/arch/arm/mach-mxs/ocotp.c @@ -232,7 +232,7 @@ static struct driver_d mxs_ocotp_driver = { static int mxs_ocotp_init(void) { - register_driver(&mxs_ocotp_driver); + platform_driver_register(&mxs_ocotp_driver); return 0; } diff --git a/arch/arm/mach-omap/arch-omap.dox b/arch/arm/mach-omap/arch-omap.dox index 9c90b4fb16..6b6b3a80ce 100644 --- a/arch/arm/mach-omap/arch-omap.dox +++ b/arch/arm/mach-omap/arch-omap.dox @@ -85,7 +85,7 @@ static struct device_d my_little_device = { }; static int my_board_devices_init(void) { /* Do Blah Blah Blah */ - return register_device(&my_little_device); + return platform_device_register(&my_little_device); } device_initcall(my_board_devices_init); diff --git a/arch/arm/mach-omap/gpio.c b/arch/arm/mach-omap/gpio.c index ff49708b15..376e9a7d55 100644 --- a/arch/arm/mach-omap/gpio.c +++ b/arch/arm/mach-omap/gpio.c @@ -151,7 +151,6 @@ static struct driver_d omap_gpio_driver = { static int omap_gpio_add(void) { - register_driver(&omap_gpio_driver); - return 0; + return platform_driver_register(&omap_gpio_driver); } coredevice_initcall(omap_gpio_add); diff --git a/arch/nios2/boards/generic/generic.c b/arch/nios2/boards/generic/generic.c index cdaaa02062..66eb856c0f 100644 --- a/arch/nios2/boards/generic/generic.c +++ b/arch/nios2/boards/generic/generic.c @@ -37,7 +37,7 @@ static int generic_devices_init(void) add_cfi_flash_device(DEVICE_ID_DYNAMIC, NIOS_SOPC_FLASH_BASE, NIOS_SOPC_FLASH_SIZE, 0); add_mem_device("ram0", NIOS_SOPC_MEMORY_BASE, NIOS_SOPC_MEMORY_SIZE, IORESOURCE_MEM_WRITEABLE); - register_device(&mac_dev); + platform_device_register(&mac_dev); /*register_device(&epcs_flash_device);*/ devfs_add_partition("nor0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self0"); diff --git a/arch/sandbox/board/board.c b/arch/sandbox/board/board.c index 91fe9bdbc5..dcad3c249b 100644 --- a/arch/sandbox/board/board.c +++ b/arch/sandbox/board/board.c @@ -44,7 +44,7 @@ static struct device_d sdl_device = { static int devices_init(void) { - register_device(&tap_device); + platform_device_register(&tap_device); if (sdl_xres) mode.xres = sdl_xres; @@ -52,7 +52,7 @@ static int devices_init(void) if (sdl_yres) mode.yres = sdl_yres; - register_device(&sdl_device); + platform_device_register(&sdl_device); return 0; } diff --git a/arch/sandbox/board/devices.c b/arch/sandbox/board/devices.c index dba0d5d893..62091ee142 100644 --- a/arch/sandbox/board/devices.c +++ b/arch/sandbox/board/devices.c @@ -25,7 +25,7 @@ static int sandbox_device_init(void) /* reset the list_head before registering for real */ dev->list.prev = NULL; dev->list.next = NULL; - register_device(dev); + platform_device_register(dev); } return 0; diff --git a/arch/sandbox/board/hostfile.c b/arch/sandbox/board/hostfile.c index 2cc7c1fbde..a3ebe19fa5 100644 --- a/arch/sandbox/board/hostfile.c +++ b/arch/sandbox/board/hostfile.c @@ -92,7 +92,7 @@ static struct driver_d hf_drv = { static int hf_init(void) { - return register_driver(&hf_drv); + return platform_driver_register(&hf_drv); } device_initcall(hf_init); -- cgit v1.2.3