From patchwork Tue Oct 19 07:29:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 264751 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9J7TlUb021735 for ; Tue, 19 Oct 2010 07:29:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758103Ab0JSH3n (ORCPT ); Tue, 19 Oct 2010 03:29:43 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:35429 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758086Ab0JSH3m (ORCPT ); Tue, 19 Oct 2010 03:29:42 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o9J7TgIL014692 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 19 Oct 2010 02:29:42 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o9J7Tfqx003360; Tue, 19 Oct 2010 02:29:41 -0500 (CDT) Received: from localhost (wsp000207096wss.emea.dhcp.ti.com [137.167.41.206]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o9J7Tef17806; Tue, 19 Oct 2010 02:29:40 -0500 (CDT) From: Felipe Balbi To: Tony Lindgren Cc: Linux OMAP Mailing List , Felipe Balbi Subject: [PATCH 4/4] cbus: tahvo-usb: move platform_device to board file Date: Tue, 19 Oct 2010 10:29:18 +0300 Message-Id: <1287473358-25634-5-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.3.rc0.35.g8ac8c In-Reply-To: <1287473358-25634-1-git-send-email-balbi@ti.com> References: <1287473358-25634-1-git-send-email-balbi@ti.com> Organization: Texas Instruments\n Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Oct 2010 07:29:48 +0000 (UTC) diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index fabc154..51bd52c 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 1823f01..ebd460e 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; @@ -291,6 +296,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);