* [PATCH] arm: omap: usb-host: fix compile warning
@ 2012-02-14 8:54 Felipe Balbi
2012-02-14 19:47 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Felipe Balbi @ 2012-02-14 8:54 UTC (permalink / raw)
To: linux-arm-kernel
when commit 3528c58 (OMAP: omap_device: when
building return platform_device instead of
omap_device) started returning a platform_device
instead of a omap_device pointer when building
a device, it failed to convert all users introducing
a compile warning when building
arch/arm/mach-omap2/usb-host.c.
This patch fixes that warning.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/mach-omap2/usb-host.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index 771dc78..f51348d 100644
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -486,7 +486,7 @@ static void setup_4430ohci_io_mux(const enum usbhs_omap_port_mode *port_mode)
void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
{
struct omap_hwmod *oh[2];
- struct omap_device *od;
+ struct platform_device *pdev;
int bus_id = -1;
int i;
@@ -522,11 +522,11 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
return;
}
- od = omap_device_build_ss(OMAP_USBHS_DEVICE, bus_id, oh, 2,
+ pdev = omap_device_build_ss(OMAP_USBHS_DEVICE, bus_id, oh, 2,
(void *)&usbhs_data, sizeof(usbhs_data),
omap_uhhtll_latency,
ARRAY_SIZE(omap_uhhtll_latency), false);
- if (IS_ERR(od)) {
+ if (IS_ERR(pdev)) {
pr_err("Could not build hwmod devices %s,%s\n",
USBHS_UHH_HWMODNAME, USBHS_TLL_HWMODNAME);
return;
--
1.7.9
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] arm: omap: usb-host: fix compile warning
2012-02-14 8:54 [PATCH] arm: omap: usb-host: fix compile warning Felipe Balbi
@ 2012-02-14 19:47 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2012-02-14 19:47 UTC (permalink / raw)
To: linux-arm-kernel
* Felipe Balbi <balbi@ti.com> [120214 00:23]:
> when commit 3528c58 (OMAP: omap_device: when
> building return platform_device instead of
> omap_device) started returning a platform_device
> instead of a omap_device pointer when building
> a device, it failed to convert all users introducing
> a compile warning when building
> arch/arm/mach-omap2/usb-host.c.
>
> This patch fixes that warning.
Thanks applying into fixes.
Tony
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-14 19:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-14 8:54 [PATCH] arm: omap: usb-host: fix compile warning Felipe Balbi
2012-02-14 19:47 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).