From patchwork Mon Jun 28 12:15:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalliguddi, Hema" X-Patchwork-Id: 108365 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5SCFTuE013391 for ; Mon, 28 Jun 2010 12:15:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753091Ab0F1MP1 (ORCPT ); Mon, 28 Jun 2010 08:15:27 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:47681 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752955Ab0F1MP0 (ORCPT ); Mon, 28 Jun 2010 08:15:26 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o5SCFJxl015089 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 28 Jun 2010 07:15:21 -0500 Received: from linfarm488.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o5SCFIoe006726; Mon, 28 Jun 2010 17:45:18 +0530 (IST) Received: from linfarm488.india.ti.com (localhost [127.0.0.1]) by linfarm488.india.ti.com (8.12.11/8.12.11) with ESMTP id o5SCFH4S006032; Mon, 28 Jun 2010 17:45:17 +0530 Received: (from a0876481@localhost) by linfarm488.india.ti.com (8.12.11/8.12.11/Submit) id o5SCFH3i006030; Mon, 28 Jun 2010 17:45:17 +0530 From: Hema HK To: linux-usb@vger.kernel.org, linux-omap@vger.kernel.org Cc: Hema HK , Felipe Balbi , tony@atomide.com Subject: [PATCH 2/4] usb: musb: Remove board_data parameter from musb_platform_init() Date: Mon, 28 Jun 2010 17:45:17 +0530 Message-Id: <1277727317-5879-1-git-send-email-hemahk@ti.com> X-Mailer: git-send-email 1.5.6.6 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 (demeter.kernel.org [140.211.167.41]); Mon, 28 Jun 2010 12:15:29 +0000 (UTC) Index: linux-omap-pm/drivers/usb/musb/blackfin.c =================================================================== --- linux-omap-pm.orig/drivers/usb/musb/blackfin.c +++ linux-omap-pm/drivers/usb/musb/blackfin.c @@ -323,7 +323,7 @@ int musb_platform_set_mode(struct musb * return -EIO; } -int __init musb_platform_init(struct musb *musb, void *board_data) +int __init musb_platform_init(struct musb *musb) { /* Index: linux-omap-pm/drivers/usb/musb/davinci.c =================================================================== --- linux-omap-pm.orig/drivers/usb/musb/davinci.c +++ linux-omap-pm/drivers/usb/musb/davinci.c @@ -376,7 +376,7 @@ int musb_platform_set_mode(struct musb * return -EIO; } -int __init musb_platform_init(struct musb *musb, void *board_data) +int __init musb_platform_init(struct musb *musb) { void __iomem *tibase = musb->ctrl_base; u32 revision; Index: linux-omap-pm/drivers/usb/musb/musb_core.c =================================================================== --- linux-omap-pm.orig/drivers/usb/musb/musb_core.c +++ linux-omap-pm/drivers/usb/musb/musb_core.c @@ -2026,7 +2026,7 @@ bad_config: * isp1504, non-OTG, etc) mostly hooking up through ULPI. */ musb->isr = generic_interrupt; - status = musb_platform_init(musb, plat->board_data); + status = musb_platform_init(musb); if (status < 0) goto fail2; Index: linux-omap-pm/drivers/usb/musb/musb_core.h =================================================================== --- linux-omap-pm.orig/drivers/usb/musb/musb_core.h +++ linux-omap-pm/drivers/usb/musb/musb_core.h @@ -610,7 +610,7 @@ extern int musb_platform_get_vbus_status #define musb_platform_get_vbus_status(x) 0 #endif -extern int __init musb_platform_init(struct musb *musb, void *board_data); +extern int __init musb_platform_init(struct musb *musb); extern int musb_platform_exit(struct musb *musb); #endif /* __MUSB_CORE_H__ */ Index: linux-omap-pm/drivers/usb/musb/omap2430.c =================================================================== --- linux-omap-pm.orig/drivers/usb/musb/omap2430.c +++ linux-omap-pm/drivers/usb/musb/omap2430.c @@ -189,10 +189,12 @@ int musb_platform_set_mode(struct musb * return 0; } -int __init musb_platform_init(struct musb *musb, void *board_data) +int __init musb_platform_init(struct musb *musb) { u32 l; - struct omap_musb_board_data *data = board_data; + struct device *dev = musb->controller; + struct musb_hdrc_platform_data *plat = dev->platform_data; + struct omap_musb_board_data *data = plat->board_data; #if defined(CONFIG_ARCH_OMAP2430) omap_cfg_reg(AE5_2430_USB0HS_STP); Index: linux-omap-pm/drivers/usb/musb/tusb6010.c =================================================================== --- linux-omap-pm.orig/drivers/usb/musb/tusb6010.c +++ linux-omap-pm/drivers/usb/musb/tusb6010.c @@ -1104,7 +1104,7 @@ err: return -ENODEV; } -int __init musb_platform_init(struct musb *musb, void *board_data) +int __init musb_platform_init(struct musb *musb) { struct platform_device *pdev; struct resource *mem;