aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2011-05-06 05:21:24 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2011-05-26 13:45:36 -0400
commitcea438dda618797922d0bfc4814e832bab19ac19 (patch)
tree9121e450299d6fc92a51147988f97b7dddffbfab
parentf5fb758de6d2ddae572ee39de54d60bf5593652a (diff)
mfd: Remove unused parameter from 88pm860x API
i2c_client parameter isn't used in some functions. Just remove it. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/88pm860x-core.c28
1 files changed, 10 insertions, 18 deletions
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 04ab50c1a6d4..91962ef38c08 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -504,7 +504,6 @@ static void device_irq_exit(struct pm860x_chip *chip)
504} 504}
505 505
506static void __devinit device_bk_init(struct pm860x_chip *chip, 506static void __devinit device_bk_init(struct pm860x_chip *chip,
507 struct i2c_client *i2c,
508 struct pm860x_platform_data *pdata) 507 struct pm860x_platform_data *pdata)
509{ 508{
510 int ret; 509 int ret;
@@ -540,7 +539,6 @@ static void __devinit device_bk_init(struct pm860x_chip *chip,
540} 539}
541 540
542static void __devinit device_led_init(struct pm860x_chip *chip, 541static void __devinit device_led_init(struct pm860x_chip *chip,
543 struct i2c_client *i2c,
544 struct pm860x_platform_data *pdata) 542 struct pm860x_platform_data *pdata)
545{ 543{
546 int ret; 544 int ret;
@@ -576,7 +574,6 @@ static void __devinit device_led_init(struct pm860x_chip *chip,
576} 574}
577 575
578static void __devinit device_regulator_init(struct pm860x_chip *chip, 576static void __devinit device_regulator_init(struct pm860x_chip *chip,
579 struct i2c_client *i2c,
580 struct pm860x_platform_data *pdata) 577 struct pm860x_platform_data *pdata)
581{ 578{
582 struct regulator_init_data *initdata; 579 struct regulator_init_data *initdata;
@@ -633,7 +630,6 @@ out:
633} 630}
634 631
635static void __devinit device_rtc_init(struct pm860x_chip *chip, 632static void __devinit device_rtc_init(struct pm860x_chip *chip,
636 struct i2c_client *i2c,
637 struct pm860x_platform_data *pdata) 633 struct pm860x_platform_data *pdata)
638{ 634{
639 int ret; 635 int ret;
@@ -653,7 +649,6 @@ static void __devinit device_rtc_init(struct pm860x_chip *chip,
653} 649}
654 650
655static void __devinit device_touch_init(struct pm860x_chip *chip, 651static void __devinit device_touch_init(struct pm860x_chip *chip,
656 struct i2c_client *i2c,
657 struct pm860x_platform_data *pdata) 652 struct pm860x_platform_data *pdata)
658{ 653{
659 int ret; 654 int ret;
@@ -673,7 +668,6 @@ static void __devinit device_touch_init(struct pm860x_chip *chip,
673} 668}
674 669
675static void __devinit device_power_init(struct pm860x_chip *chip, 670static void __devinit device_power_init(struct pm860x_chip *chip,
676 struct i2c_client *i2c,
677 struct pm860x_platform_data *pdata) 671 struct pm860x_platform_data *pdata)
678{ 672{
679 int ret; 673 int ret;
@@ -701,7 +695,6 @@ static void __devinit device_power_init(struct pm860x_chip *chip,
701} 695}
702 696
703static void __devinit device_onkey_init(struct pm860x_chip *chip, 697static void __devinit device_onkey_init(struct pm860x_chip *chip,
704 struct i2c_client *i2c,
705 struct pm860x_platform_data *pdata) 698 struct pm860x_platform_data *pdata)
706{ 699{
707 int ret; 700 int ret;
@@ -716,7 +709,6 @@ static void __devinit device_onkey_init(struct pm860x_chip *chip,
716} 709}
717 710
718static void __devinit device_codec_init(struct pm860x_chip *chip, 711static void __devinit device_codec_init(struct pm860x_chip *chip,
719 struct i2c_client *i2c,
720 struct pm860x_platform_data *pdata) 712 struct pm860x_platform_data *pdata)
721{ 713{
722 int ret; 714 int ret;
@@ -784,12 +776,12 @@ static void __devinit device_8607_init(struct pm860x_chip *chip,
784 if (ret < 0) 776 if (ret < 0)
785 goto out; 777 goto out;
786 778
787 device_regulator_init(chip, i2c, pdata); 779 device_regulator_init(chip, pdata);
788 device_rtc_init(chip, i2c, pdata); 780 device_rtc_init(chip, pdata);
789 device_onkey_init(chip, i2c, pdata); 781 device_onkey_init(chip, pdata);
790 device_touch_init(chip, i2c, pdata); 782 device_touch_init(chip, pdata);
791 device_power_init(chip, i2c, pdata); 783 device_power_init(chip, pdata);
792 device_codec_init(chip, i2c, pdata); 784 device_codec_init(chip, pdata);
793out: 785out:
794 return; 786 return;
795} 787}
@@ -801,8 +793,8 @@ int __devinit pm860x_device_init(struct pm860x_chip *chip,
801 793
802 switch (chip->id) { 794 switch (chip->id) {
803 case CHIP_PM8606: 795 case CHIP_PM8606:
804 device_bk_init(chip, chip->client, pdata); 796 device_bk_init(chip, pdata);
805 device_led_init(chip, chip->client, pdata); 797 device_led_init(chip, pdata);
806 break; 798 break;
807 case CHIP_PM8607: 799 case CHIP_PM8607:
808 device_8607_init(chip, chip->client, pdata); 800 device_8607_init(chip, chip->client, pdata);
@@ -812,8 +804,8 @@ int __devinit pm860x_device_init(struct pm860x_chip *chip,
812 if (chip->companion) { 804 if (chip->companion) {
813 switch (chip->id) { 805 switch (chip->id) {
814 case CHIP_PM8607: 806 case CHIP_PM8607:
815 device_bk_init(chip, chip->companion, pdata); 807 device_bk_init(chip, pdata);
816 device_led_init(chip, chip->companion, pdata); 808 device_led_init(chip, pdata);
817 break; 809 break;
818 case CHIP_PM8606: 810 case CHIP_PM8606:
819 device_8607_init(chip, chip->companion, pdata); 811 device_8607_init(chip, chip->companion, pdata);