From: 柯飞雄 Date: Fri, 14 May 2010 01:32:54 +0000 (+0000) Subject: mod i2c clkid X-Git-Tag: firefly_0821_release~11539 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fc62fdd5045453b47d9844700bcc9831d5aa1403;p=firefly-linux-kernel-4.4.55.git mod i2c clkid --- diff --git a/drivers/i2c/busses/i2c-rk2818.c b/drivers/i2c/busses/i2c-rk2818.c index 8c1284795fb8..eb2c3638ddd8 100755 --- a/drivers/i2c/busses/i2c-rk2818.c +++ b/drivers/i2c/busses/i2c-rk2818.c @@ -30,6 +30,7 @@ #include #include "i2c-rk2818.h" +#define DRV_NAME "rk2818_i2c" #define RK2818_I2C_TIMEOUT (msecs_to_jiffies(500)) @@ -578,7 +579,7 @@ static int rk2818_i2c_probe(struct platform_device *pdev) return -ENOMEM; } - strlcpy(i2c->adap.name, "rk2818_i2c", sizeof(i2c->adap.name)); + strlcpy(i2c->adap.name, DRV_NAME, sizeof(i2c->adap.name)); i2c->adap.owner = THIS_MODULE; i2c->adap.algo = &rk2818_i2c_algorithm; i2c->adap.class = I2C_CLASS_HWMON; @@ -586,7 +587,7 @@ static int rk2818_i2c_probe(struct platform_device *pdev) i2c->dev = &pdev->dev; - i2c->clk = clk_get(&pdev->dev, pdata->clk_id); + i2c->clk = clk_get(&pdev->dev, DRV_NAME); if (IS_ERR(i2c->clk)) { dev_err(&pdev->dev, "cannot get clock\n"); ret = -ENOENT; @@ -740,7 +741,7 @@ static struct platform_driver rk2818_i2c_driver = { .resume = rk2818_i2c_resume, .driver = { .owner = THIS_MODULE, - .name = "rk2818_i2c", + .name = DRV_NAME, }, };