@@ -236,6 +236,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 struct resource retu_resource[] = {
{
.start = -EINVAL, /* set later */
@@ -284,6 +289,7 @@ static void __init n8x0_cbus_init(void)
tahvo_resource[0].start = gpio_to_irq(tahvo_irq_pin);
platform_device_register(&tahvo_device);
+ platform_device_register(&tahvo_usb_device);
if (machine_is_nokia770()) {
retu_irq_pin = 62;
@@ -742,27 +742,15 @@ 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;
}
@@ -774,7 +762,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);