i2c-s3c2410: Keep a copy of platform data and use it
Thomas Abraham [Tue, 13 Sep 2011 04:16:04 +0000 (09:16 +0530)]
The platform data is copied into driver's private data and the copy is
used for all access to the platform data. This simpifies the addition
of device tree support for the i2c-s3c2410 driver.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

drivers/i2c/busses/i2c-s3c2410.c

index f84a63c..266dd83 100644 (file)
@@ -78,6 +78,7 @@ struct s3c24xx_i2c {
        struct resource         *ioarea;
        struct i2c_adapter      adap;
 
+       struct s3c2410_platform_i2c     *pdata;
 #ifdef CONFIG_CPU_FREQ
        struct notifier_block   freq_transition;
 #endif
@@ -625,7 +626,7 @@ static int s3c24xx_i2c_calcdivisor(unsigned long clkin, unsigned int wanted,
 
 static int s3c24xx_i2c_clockrate(struct s3c24xx_i2c *i2c, unsigned int *got)
 {
-       struct s3c2410_platform_i2c *pdata = i2c->dev->platform_data;
+       struct s3c2410_platform_i2c *pdata = i2c->pdata;
        unsigned long clkin = clk_get_rate(i2c->clk);
        unsigned int divs, div1;
        unsigned long target_frequency;
@@ -754,7 +755,7 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 
        /* get the plafrom data */
 
-       pdata = i2c->dev->platform_data;
+       pdata = i2c->pdata;
 
        /* inititalise the gpio */
 
@@ -793,7 +794,7 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 static int s3c24xx_i2c_probe(struct platform_device *pdev)
 {
        struct s3c24xx_i2c *i2c;
-       struct s3c2410_platform_i2c *pdata;
+       struct s3c2410_platform_i2c *pdata = NULL;
        struct resource *res;
        int ret;
 
@@ -809,6 +810,15 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
+       i2c->pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+       if (!i2c->pdata) {
+               ret = -ENOMEM;
+               goto err_noclk;
+       }
+
+       if (pdata)
+               memcpy(i2c->pdata, pdata, sizeof(*pdata));
+
        strlcpy(i2c->adap.name, "s3c2410-i2c", sizeof(i2c->adap.name));
        i2c->adap.owner   = THIS_MODULE;
        i2c->adap.algo    = &s3c24xx_i2c_algorithm;
@@ -903,7 +913,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
         * being bus 0.
         */
 
-       i2c->adap.nr = pdata->bus_num;
+       i2c->adap.nr = i2c->pdata->bus_num;
 
        ret = i2c_add_numbered_adapter(&i2c->adap);
        if (ret < 0) {