aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2011-04-21 22:20:39 +0900
committerBen Dooks <ben-linux@fluff.org>2011-05-11 07:08:13 +0100
commit1082d5d29d9a71f43b969b89ce613374602a6946 (patch)
tree062c8113d993c0015f09cd0d24a981bd60c284a8
parent9f381a61f58bb6487c93ce2233bb9992f8ea9211 (diff)
downloadkernel_samsung_smdk4412-1082d5d29d9a71f43b969b89ce613374602a6946.zip
kernel_samsung_smdk4412-1082d5d29d9a71f43b969b89ce613374602a6946.tar.gz
kernel_samsung_smdk4412-1082d5d29d9a71f43b969b89ce613374602a6946.tar.bz2
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>
-rw-r--r--drivers/i2c/busses/i2c-sh_mobile.c6
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 2707f5e..5a1d37d 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)
struct sh_mobile_i2c_data *pd;
struct i2c_adapter *adap;
struct resource *res;
- char clk_name[8];
int size;
int ret;
@@ -587,10 +586,9 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
return -ENOMEM;
}
- snprintf(clk_name, sizeof(clk_name), "i2c%d", dev->id);
- pd->clk = clk_get(&dev->dev, clk_name);
+ pd->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(pd->clk)) {
- dev_err(&dev->dev, "cannot get clock \"%s\"\n", clk_name);
+ dev_err(&dev->dev, "cannot get clock\n");
ret = PTR_ERR(pd->clk);
goto err;
}