mfd: 88pm860x: Avoid to check resource for preg regulator (ff13e9e2) · Commits · 戴 / test

drivers/mfd/88pm860x-core.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -150,10 +150,6 @@ static struct resource charger_resources[] __devinitdata = {
		{PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,},
		};

		static struct resource preg_resources[] __devinitdata = {
		{PM8606_ID_PREG, PM8606_ID_PREG, "preg", IORESOURCE_REG,},
		};

		static struct resource rtc_resources[] __devinitdata = {
		{PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,},
		};
		@@ -960,10 +956,8 @@ static void __devinit device_power_init(struct pm860x_chip *chip,

		power_devs[2].platform_data = &preg_init_data;
		power_devs[2].pdata_size = sizeof(struct regulator_init_data);
		power_devs[2].num_resources = ARRAY_SIZE(preg_resources);
		power_devs[2].resources = &preg_resources[0],
		ret = mfd_add_devices(chip->dev, 0, &power_devs[2], 1,
		&preg_resources[0], chip->irq_base, NULL);
		NULL, chip->irq_base, NULL);
		if (ret < 0)
		dev_err(chip->dev, "Failed to add preg subdev\n");
		}

+19 −13

Original line number	Diff line number	Diff line
		@@ -358,7 +358,9 @@ static struct pm8607_regulator_info pm8607_regulator_info[] = {
		PM8607_LDO(12, LDO12, 0, SUPPLIES_EN12, 5),
		PM8607_LDO(13, VIBRATOR_SET, 1, VIBRATOR_SET, 0),
		PM8607_LDO(14, LDO14, 0, SUPPLIES_EN12, 6),
		};

		static struct pm8607_regulator_info pm8606_regulator_info[] = {
		PM8606_PREG(PREREGULATORB, 5),
		};

		@@ -372,10 +374,8 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
		int i;

		res = platform_get_resource(pdev, IORESOURCE_REG, 0);
		if (res == NULL) {
		dev_err(&pdev->dev, "No REG resource!\n");
		return -EINVAL;
		}
		if (res) {
		/* There're resources in 88PM8607 regulator driver */
		for (i = 0; i < ARRAY_SIZE(pm8607_regulator_info); i++) {
		info = &pm8607_regulator_info[i];
		if (info->desc.vsel_reg == res->start)
		@@ -386,6 +386,12 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
		(unsigned long long)res->start);
		return -EINVAL;
		}
		} else {
		/* There's no resource in 88PM8606 PREG regulator driver */
		info = &pm8606_regulator_info[0];
		/* i is used to check regulator ID */
		i = -1;
		}
		info->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion;
		info->i2c_8606 = (chip->id == CHIP_PM8607) ? chip->companion :
		chip->client;