| Message ID | 1246919176-28683-1-git-send-email-khilman@deeprootsystems.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
Hello. Kevin Hilman wrote: > DaVinci core code has converted to the new clkdev API so > clock name strings are not needed. Instead, just the a > 'struct device' pointer is needed. > > Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> > --- > Fix needed for 2.6.31 > > drivers/ide/palm_bk3710.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c > index 3c1dc01..f8eddf0 100644 > --- a/drivers/ide/palm_bk3710.c > +++ b/drivers/ide/palm_bk3710.c > @@ -318,7 +318,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) > int i, rc; > struct ide_hw hw, *hws[] = { &hw }; > > - clk = clk_get(&pdev->dev, "IDECLK"); > + clk = clk_get(&pdev->dev, NULL); > if (IS_ERR(clk)) > return -ENODEV; > It doesn't seem strictly necessary for 2.6.31 -- only in the sense that "IDECLK" isn't named so anymore, however, clk_get() should still work. MBR, Sergei
diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c index 3c1dc01..f8eddf0 100644 --- a/drivers/ide/palm_bk3710.c +++ b/drivers/ide/palm_bk3710.c @@ -318,7 +318,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) int i, rc; struct ide_hw hw, *hws[] = { &hw }; - clk = clk_get(&pdev->dev, "IDECLK"); + clk = clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) return -ENODEV;
DaVinci core code has converted to the new clkdev API so clock name strings are not needed. Instead, just the a 'struct device' pointer is needed. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> --- Fix needed for 2.6.31 drivers/ide/palm_bk3710.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)