Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[ARM] omap: ensure OMAP drivers pass a struct device to clk_get()

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Russell King and committed by
Russell King
953a7e84 1639058e

+6 -6
+1 -1
drivers/char/hw_random/omap-rng.c
··· 102 102 return -EBUSY; 103 103 104 104 if (cpu_is_omap24xx()) { 105 - rng_ick = clk_get(NULL, "rng_ick"); 105 + rng_ick = clk_get(&pdev->dev, "rng_ick"); 106 106 if (IS_ERR(rng_ick)) { 107 107 dev_err(&pdev->dev, "Could not get rng_ick\n"); 108 108 ret = PTR_ERR(rng_ick);
+3 -3
drivers/usb/host/ohci-omap.c
··· 315 315 return -ENODEV; 316 316 } 317 317 318 - usb_host_ck = clk_get(0, "usb_hhc_ck"); 318 + usb_host_ck = clk_get(&pdev->dev, "usb_hhc_ck"); 319 319 if (IS_ERR(usb_host_ck)) 320 320 return PTR_ERR(usb_host_ck); 321 321 322 322 if (!cpu_is_omap15xx()) 323 - usb_dc_ck = clk_get(0, "usb_dc_ck"); 323 + usb_dc_ck = clk_get(&pdev->dev, "usb_dc_ck"); 324 324 else 325 - usb_dc_ck = clk_get(0, "lb_ck"); 325 + usb_dc_ck = clk_get(&pdev->dev, "lb_ck"); 326 326 327 327 if (IS_ERR(usb_dc_ck)) { 328 328 clk_put(usb_host_ck);
+2 -2
drivers/video/omap/lcdc.c
··· 800 800 /* FIXME: 801 801 * According to errata some platforms have a clock rate limitiation 802 802 */ 803 - lcdc.lcd_ck = clk_get(NULL, "lcd_ck"); 803 + lcdc.lcd_ck = clk_get(fbdev->dev, "lcd_ck"); 804 804 if (IS_ERR(lcdc.lcd_ck)) { 805 805 dev_err(fbdev->dev, "unable to access LCD clock\n"); 806 806 r = PTR_ERR(lcdc.lcd_ck); 807 807 goto fail0; 808 808 } 809 809 810 - tc_ck = clk_get(NULL, "tc_ck"); 810 + tc_ck = clk_get(fbdev->dev, "tc_ck"); 811 811 if (IS_ERR(tc_ck)) { 812 812 dev_err(fbdev->dev, "unable to access TC clock\n"); 813 813 r = PTR_ERR(tc_ck);