[ARM] omap: ensure OMAP drivers pass a struct device to clk_get()
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
1639058ed1
commit
953a7e8476
|
@ -102,7 +102,7 @@ static int __init omap_rng_probe(struct platform_device *pdev)
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
|
|
||||||
if (cpu_is_omap24xx()) {
|
if (cpu_is_omap24xx()) {
|
||||||
rng_ick = clk_get(NULL, "rng_ick");
|
rng_ick = clk_get(&pdev->dev, "rng_ick");
|
||||||
if (IS_ERR(rng_ick)) {
|
if (IS_ERR(rng_ick)) {
|
||||||
dev_err(&pdev->dev, "Could not get rng_ick\n");
|
dev_err(&pdev->dev, "Could not get rng_ick\n");
|
||||||
ret = PTR_ERR(rng_ick);
|
ret = PTR_ERR(rng_ick);
|
||||||
|
|
|
@ -315,14 +315,14 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
usb_host_ck = clk_get(0, "usb_hhc_ck");
|
usb_host_ck = clk_get(&pdev->dev, "usb_hhc_ck");
|
||||||
if (IS_ERR(usb_host_ck))
|
if (IS_ERR(usb_host_ck))
|
||||||
return PTR_ERR(usb_host_ck);
|
return PTR_ERR(usb_host_ck);
|
||||||
|
|
||||||
if (!cpu_is_omap15xx())
|
if (!cpu_is_omap15xx())
|
||||||
usb_dc_ck = clk_get(0, "usb_dc_ck");
|
usb_dc_ck = clk_get(&pdev->dev, "usb_dc_ck");
|
||||||
else
|
else
|
||||||
usb_dc_ck = clk_get(0, "lb_ck");
|
usb_dc_ck = clk_get(&pdev->dev, "lb_ck");
|
||||||
|
|
||||||
if (IS_ERR(usb_dc_ck)) {
|
if (IS_ERR(usb_dc_ck)) {
|
||||||
clk_put(usb_host_ck);
|
clk_put(usb_host_ck);
|
||||||
|
|
|
@ -800,14 +800,14 @@ static int omap_lcdc_init(struct omapfb_device *fbdev, int ext_mode,
|
||||||
/* FIXME:
|
/* FIXME:
|
||||||
* According to errata some platforms have a clock rate limitiation
|
* According to errata some platforms have a clock rate limitiation
|
||||||
*/
|
*/
|
||||||
lcdc.lcd_ck = clk_get(NULL, "lcd_ck");
|
lcdc.lcd_ck = clk_get(fbdev->dev, "lcd_ck");
|
||||||
if (IS_ERR(lcdc.lcd_ck)) {
|
if (IS_ERR(lcdc.lcd_ck)) {
|
||||||
dev_err(fbdev->dev, "unable to access LCD clock\n");
|
dev_err(fbdev->dev, "unable to access LCD clock\n");
|
||||||
r = PTR_ERR(lcdc.lcd_ck);
|
r = PTR_ERR(lcdc.lcd_ck);
|
||||||
goto fail0;
|
goto fail0;
|
||||||
}
|
}
|
||||||
|
|
||||||
tc_ck = clk_get(NULL, "tc_ck");
|
tc_ck = clk_get(fbdev->dev, "tc_ck");
|
||||||
if (IS_ERR(tc_ck)) {
|
if (IS_ERR(tc_ck)) {
|
||||||
dev_err(fbdev->dev, "unable to access TC clock\n");
|
dev_err(fbdev->dev, "unable to access TC clock\n");
|
||||||
r = PTR_ERR(tc_ck);
|
r = PTR_ERR(tc_ck);
|
||||||
|
|
Loading…
Reference in New Issue