No functional changes, just moving platform_device
registration to the proper location.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
---
arch/arm/mach-omap1/board-nokia770.c | 6 ++++++
arch/arm/mach-omap2/board-n8x0.c | 7 ++++++-
drivers/cbus/tahvo-usb.c | 15 ++-------------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 962363b..5dd21dc 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -141,6 +141,11 @@ static struct platform_device tahvo_device = {
.num_resources = ARRAY_SIZE(tahvo_resource),
};
+static struct platform_device tahvo_usb_device = {
+ .name = "tahvo-usb",
+ .id = -1,
+};
+
static void __init nokia770_cbus_init(void)
{
int ret;
@@ -181,6 +186,7 @@ static void __init nokia770_cbus_init(void)
tahvo_resource[0].start = gpio_to_irq(40);
platform_device_register(&tahvo_device);
+ platform_device_register(&tahvo_usb_device);
}
#else
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index c840710..aaa40ae 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -250,6 +250,11 @@ static struct platform_device tahvo_device = {
.num_resources = ARRAY_SIZE(tahvo_resource),
};
+static struct platform_device tahvo_usb_device = {
+ .name = "tahvo-usb",
+ .id = -1,
+};
+
static void __init n8x0_cbus_init(void)
{
int ret;
@@ -276,7 +281,6 @@ static void __init n8x0_cbus_init(void)
return;
}
- /* Set the pin as input */
ret = gpio_direction_input(111);
if (ret) {
pr_err("tahvo: Unable to change direction\n");
@@ -287,6 +291,7 @@ static void __init n8x0_cbus_init(void)
tahvo_resource[0].start = gpio_to_irq(111);
platform_device_register(&tahvo_device);
+ platform_device_register(&tahvo_usb_device);
}
#else
diff --git a/drivers/cbus/tahvo-usb.c b/drivers/cbus/tahvo-usb.c
index 1cb81fd..3b83bab 100644
--- a/drivers/cbus/tahvo-usb.c
+++ b/drivers/cbus/tahvo-usb.c
@@ -742,30 +742,20 @@ static struct platform_driver tahvo_usb_driver = {
.remove = __exit_p(tahvo_usb_remove),
};
-static struct platform_device tahvo_usb_device = {
- .name = "tahvo-usb",
- .id = -1,
-};
-
static int __init tahvo_usb_init(void)
{
int ret = 0;
- printk(KERN_INFO "Tahvo USB transceiver driver initializing\n");
ret = platform_driver_probe(&tahvo_usb_driver, tahvo_usb_probe);
if (ret)
return ret;
- ret = platform_device_register(&tahvo_usb_device);
- if (ret < 0) {
- platform_driver_unregister(&tahvo_usb_driver);
- return ret;
- }
+
ret = platform_driver_probe(&omap_otg_driver, omap_otg_probe);
if (ret) {
- platform_device_unregister(&tahvo_usb_device);
platform_driver_unregister(&tahvo_usb_driver);
return ret;
}
+
return 0;
}
@@ -774,7 +764,6 @@ subsys_initcall(tahvo_usb_init);
static void __exit tahvo_usb_exit(void)
{
platform_driver_unregister(&omap_otg_driver);
- platform_device_unregister(&tahvo_usb_device);
platform_driver_unregister(&tahvo_usb_driver);
}
module_exit(tahvo_usb_exit);
--
1.7.3.rc0.35.g8ac8c
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
