From 72945c6900f5da7bc842a33b3493e0018b674bb9 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Sun, 4 Dec 2011 23:29:23 +0800 Subject: SAUCE: fix the removal of mxc_register_device() Signed-off-by: Eric Miao --- arch/arm/mach-mx5/board-mx53_loco.c | 8 ++++++-- arch/arm/mach-mx5/usb_dr.c | 3 ++- arch/arm/mach-mx5/usb_h1.c | 9 +++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-mx5/board-mx53_loco.c b/arch/arm/mach-mx5/board-mx53_loco.c index fe3485f62b3..f517862d1f7 100644 --- a/arch/arm/mach-mx5/board-mx53_loco.c +++ b/arch/arm/mach-mx5/board-mx53_loco.c @@ -284,6 +284,9 @@ static struct mxc_audio_platform_data loco_audio_data = { static struct platform_device loco_audio_device = { .name = "imx-sgtl5000", + .dev = { + .platform_data = &loco_audio_data, + } }; static inline void mx53_loco_fec_reset(void) @@ -558,7 +561,7 @@ static void __init mx53_loco_board_init(void) imx53_add_sdhci_esdhc_imx(0, &mx53_loco_sd1_data); imx53_add_sdhci_esdhc_imx(2, &mx53_loco_sd3_data); - mxc_register_device(&loco_audio_device, &loco_audio_data); + platform_device_register(&loco_audio_device); imx53_add_imx_ssi(1, &loco_ssi_pdata); imx53_add_srtc(); imx_add_gpio_keys(&loco_button_data); @@ -570,7 +573,8 @@ static void __init mx53_loco_board_init(void) i2c_register_board_info(0, mxc_i2c0_board_info, ARRAY_SIZE(mxc_i2c0_board_info)); - mxc_register_device(&mxc_pm_device, &loco_pm_data); + mxc_pm_device.dev.platform_data = &loco_pm_data; + platform_device_register(&mxc_pm_device); mx53_loco_init_da9052(); pm_power_off = da9053_power_off; diff --git a/arch/arm/mach-mx5/usb_dr.c b/arch/arm/mach-mx5/usb_dr.c index 099cd402774..ae4df535d1e 100755 --- a/arch/arm/mach-mx5/usb_dr.c +++ b/arch/arm/mach-mx5/usb_dr.c @@ -328,7 +328,8 @@ void __init mx5_usb_dr_init(void) ret |= platform_device_register(&mx53_usbdr_udc_device); dr_wakeup_config.usb_pdata[2] = mx53_usbdr_udc_device.dev.platform_data; #endif - ret |= mxc_register_device(&mx53_usbdr_wakeup_device, &dr_wakeup_config); + mx53_usbdr_wakeup_device.dev.platform_data = &dr_wakeup_config; + ret |= platform_device_register(&mx53_usbdr_wakeup_device); if (ret) printk(KERN_ERR "%s(%d): error occures while init usb dr \n", __func__, __LINE__); } diff --git a/arch/arm/mach-mx5/usb_h1.c b/arch/arm/mach-mx5/usb_h1.c index 11058cac793..0336b16a133 100644 --- a/arch/arm/mach-mx5/usb_h1.c +++ b/arch/arm/mach-mx5/usb_h1.c @@ -20,6 +20,7 @@ #include #include +#include #include #include #include @@ -287,9 +288,13 @@ void __init mx5_usbh1_init(void) mx53_usbh1_device.resource[0].end -= MX53_OFFSET; } if (cpu_is_mx53()) { - mxc_register_device(&mx53_usbh1_device, &usbh1_config); usbh1_config.wakeup_pdata = &usbh1_wakeup_config; - mxc_register_device(&mx53_usbh1_wakeup_device, &usbh1_wakeup_config); + + mx53_usbh1_device.dev.platform_data = &usbh1_config; + platform_device_register(&mx53_usbh1_device); + + mx53_usbh1_wakeup_device.dev.platform_data = &usbh1_wakeup_config; + platform_device_register(&mx53_usbh1_wakeup_device); } } -- cgit v1.2.3