diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 10:08:14 (GMT) |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 10:08:14 (GMT) |
| commit | 828fa1e60117535d9b1e1b09444842ae66e8424d (patch) | |
| tree | 281f5bff9a12c760ca947a98569df63c8ca85909 /drivers/mfd/omap-usb-host.c | |
| parent | 09fd86780bb4603df1886e17127f5beb97f70ffb (diff) | |
| parent | 8a105ca202b1a1061a24f1e980206cd2808e2f8b (diff) | |
| download | linux-fsl-qoriq-828fa1e60117535d9b1e1b09444842ae66e8424d.tar.xz | |
Merge tag 'mfd-lee-3.12-1' of git://git.linaro.org/people/ljones/mfd
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/omap-usb-host.c')
| -rw-r--r-- | drivers/mfd/omap-usb-host.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 759fae3..d2b8e71 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -232,7 +232,7 @@ err_end: static int omap_usbhs_alloc_children(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct usbhs_omap_platform_data *pdata = dev->platform_data; + struct usbhs_omap_platform_data *pdata = dev_get_platdata(dev); struct platform_device *ehci; struct platform_device *ohci; struct resource *res; @@ -571,7 +571,7 @@ static struct of_device_id usbhs_child_match_table[] = { static int usbhs_omap_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct usbhs_omap_platform_data *pdata = dev->platform_data; + struct usbhs_omap_platform_data *pdata = dev_get_platdata(dev); struct usbhs_hcd_omap *omap; struct resource *res; int ret = 0; |