diff options
| author | Felipe Balbi | 2012-02-14 09:54:46 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2012-02-14 20:46:58 +0100 |
| commit | abe763f2bccbc592d33a3a9c334acaefea022c0a (patch) | |
| tree | a0bfef08a7421c05f47984435ced3033c5a93bd2 /arch/arm | |
| parent | ARM: OMAP4: Move the barrier memboclk_steal() as part of reserve callback (diff) | |
| download | kernel-qcow2-linux-abe763f2bccbc592d33a3a9c334acaefea022c0a.tar.gz kernel-qcow2-linux-abe763f2bccbc592d33a3a9c334acaefea022c0a.tar.xz kernel-qcow2-linux-abe763f2bccbc592d33a3a9c334acaefea022c0a.zip | |
ARM: OMAP2+: usb-host: fix compile warning
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>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | 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 771dc781b746..f51348dafafd 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; |