Skip to content

Commit

Permalink
ARM: SAMSUNG: Use generic set_plat_data function
Browse files Browse the repository at this point in the history
Calls the generic s3c_set_platdata function instead.

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Naveen Krishna Chatradhi authored and Kukjin Kim committed Jul 20, 2011
1 parent cf2e9c7 commit 2c2e2c2
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 48 deletions.
10 changes: 4 additions & 6 deletions arch/arm/plat-samsung/dev-i2c0.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,9 @@ void __init s3c_i2c0_set_platdata(struct s3c2410_platform_i2c *pd)
if (!pd)
pd = &default_i2c_data0;

npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);
if (!npd)
printk(KERN_ERR "%s: no memory for platform data\n", __func__);
else if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c0_cfg_gpio;
npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
&s3c_device_i2c0);

s3c_device_i2c0.dev.platform_data = npd;
if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c0_cfg_gpio;
}
10 changes: 4 additions & 6 deletions arch/arm/plat-samsung/dev-i2c1.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,9 @@ void __init s3c_i2c1_set_platdata(struct s3c2410_platform_i2c *pd)
if (!pd)
pd = &default_i2c_data1;

npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);
if (!npd)
printk(KERN_ERR "%s: no memory for platform data\n", __func__);
else if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c1_cfg_gpio;
npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
&s3c_device_i2c1);

s3c_device_i2c1.dev.platform_data = npd;
if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c1_cfg_gpio;
}
10 changes: 4 additions & 6 deletions arch/arm/plat-samsung/dev-i2c2.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,9 @@ void __init s3c_i2c2_set_platdata(struct s3c2410_platform_i2c *pd)
if (!pd)
pd = &default_i2c_data2;

npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);
if (!npd)
printk(KERN_ERR "%s: no memory for platform data\n", __func__);
else if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c2_cfg_gpio;
npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
&s3c_device_i2c2);

s3c_device_i2c2.dev.platform_data = npd;
if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c2_cfg_gpio;
}
10 changes: 4 additions & 6 deletions arch/arm/plat-samsung/dev-i2c3.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,9 @@ void __init s3c_i2c3_set_platdata(struct s3c2410_platform_i2c *pd)
if (!pd)
pd = &default_i2c_data3;

npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);
if (!npd)
printk(KERN_ERR "%s: no memory for platform data\n", __func__);
else if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c3_cfg_gpio;
npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
&s3c_device_i2c3);

s3c_device_i2c3.dev.platform_data = npd;
if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c3_cfg_gpio;
}
10 changes: 4 additions & 6 deletions arch/arm/plat-samsung/dev-i2c4.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,9 @@ void __init s3c_i2c4_set_platdata(struct s3c2410_platform_i2c *pd)
if (!pd)
pd = &default_i2c_data4;

npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);
if (!npd)
printk(KERN_ERR "%s: no memory for platform data\n", __func__);
else if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c4_cfg_gpio;
npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
&s3c_device_i2c4);

s3c_device_i2c4.dev.platform_data = npd;
if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c4_cfg_gpio;
}
10 changes: 4 additions & 6 deletions arch/arm/plat-samsung/dev-i2c5.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,9 @@ void __init s3c_i2c5_set_platdata(struct s3c2410_platform_i2c *pd)
if (!pd)
pd = &default_i2c_data5;

npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);
if (!npd)
printk(KERN_ERR "%s: no memory for platform data\n", __func__);
else if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c5_cfg_gpio;
npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
&s3c_device_i2c5);

s3c_device_i2c5.dev.platform_data = npd;
if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c5_cfg_gpio;
}
10 changes: 4 additions & 6 deletions arch/arm/plat-samsung/dev-i2c6.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,9 @@ void __init s3c_i2c6_set_platdata(struct s3c2410_platform_i2c *pd)
if (!pd)
pd = &default_i2c_data6;

npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);
if (!npd)
printk(KERN_ERR "%s: no memory for platform data\n", __func__);
else if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c6_cfg_gpio;
npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
&s3c_device_i2c6);

s3c_device_i2c6.dev.platform_data = npd;
if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c6_cfg_gpio;
}
10 changes: 4 additions & 6 deletions arch/arm/plat-samsung/dev-i2c7.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,9 @@ void __init s3c_i2c7_set_platdata(struct s3c2410_platform_i2c *pd)
if (!pd)
pd = &default_i2c_data7;

npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);
if (!npd)
printk(KERN_ERR "%s: no memory for platform data\n", __func__);
else if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c7_cfg_gpio;
npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
&s3c_device_i2c7);

s3c_device_i2c7.dev.platform_data = npd;
if (!npd->cfg_gpio)
npd->cfg_gpio = s3c_i2c7_cfg_gpio;
}

0 comments on commit 2c2e2c2

Please sign in to comment.