diff options
author | Magnus Damm <damm@opensource.se> | 2011-04-21 09:20:39 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2011-05-11 02:08:13 -0400 |
commit | 1082d5d29d9a71f43b969b89ce613374602a6946 (patch) | |
tree | 062c8113d993c0015f09cd0d24a981bd60c284a8 /drivers/i2c/busses | |
parent | 9f381a61f58bb6487c93ce2233bb9992f8ea9211 (diff) |
i2c: i2c-sh_mobile clock string removal
Remove the clock string magic from the i2c-sh_mobile driver
now when all platforms support clkdev properly.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r-- | drivers/i2c/busses/i2c-sh_mobile.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index 2707f5e17158..5a1d37d0b62f 100644 --- a/drivers/i2c/busses/i2c-sh_mobile.c +++ b/drivers/i2c/busses/i2c-sh_mobile.c | |||
@@ -577,7 +577,6 @@ static int sh_mobile_i2c_probe(struct platform_device *dev) | |||
577 | struct sh_mobile_i2c_data *pd; | 577 | struct sh_mobile_i2c_data *pd; |
578 | struct i2c_adapter *adap; | 578 | struct i2c_adapter *adap; |
579 | struct resource *res; | 579 | struct resource *res; |
580 | char clk_name[8]; | ||
581 | int size; | 580 | int size; |
582 | int ret; | 581 | int ret; |
583 | 582 | ||
@@ -587,10 +586,9 @@ static int sh_mobile_i2c_probe(struct platform_device *dev) | |||
587 | return -ENOMEM; | 586 | return -ENOMEM; |
588 | } | 587 | } |
589 | 588 | ||
590 | snprintf(clk_name, sizeof(clk_name), "i2c%d", dev->id); | 589 | pd->clk = clk_get(&dev->dev, NULL); |
591 | pd->clk = clk_get(&dev->dev, clk_name); | ||
592 | if (IS_ERR(pd->clk)) { | 590 | if (IS_ERR(pd->clk)) { |
593 | dev_err(&dev->dev, "cannot get clock \"%s\"\n", clk_name); | 591 | dev_err(&dev->dev, "cannot get clock\n"); |
594 | ret = PTR_ERR(pd->clk); | 592 | ret = PTR_ERR(pd->clk); |
595 | goto err; | 593 | goto err; |
596 | } | 594 | } |