regulator: pbias: Get rid of struct pbias_regulator_data (df8c542e) · Commits · 戴 / test

drivers/regulator/pbias-regulator.c

+26 −43

Original line number	Diff line number	Diff line
		@@ -38,15 +38,6 @@ struct pbias_reg_info {
		int n_voltages;
		};

		struct pbias_regulator_data {
		struct regulator_desc desc;
		void __iomem *pbias_addr;
		struct regulator_dev *dev;
		struct regmap *syscon;
		const struct pbias_reg_info *info;
		int voltage;
		};

		struct pbias_of_data {
		unsigned int offset;
		};
		@@ -157,13 +148,13 @@ MODULE_DEVICE_TABLE(of, pbias_of_match);
		static int pbias_regulator_probe(struct platform_device *pdev)
		{
		struct device_node *np = pdev->dev.of_node;
		struct pbias_regulator_data *drvdata;
		struct resource *res;
		struct regulator_config cfg = { };
		struct regulator_desc *desc;
		struct regulator_dev *rdev;
		struct regmap *syscon;
		const struct pbias_reg_info *info;
		int ret = 0;
		int count, idx, data_idx = 0;
		int ret, count, idx;
		const struct pbias_of_data *data;
		unsigned int offset;

		@@ -172,10 +163,8 @@ static int pbias_regulator_probe(struct platform_device *pdev)
		if (count < 0)
		return count;

		drvdata = devm_kcalloc(&pdev->dev,
		count, sizeof(struct pbias_regulator_data),
		GFP_KERNEL);
		if (!drvdata)
		desc = devm_kcalloc(&pdev->dev, count, sizeof(*desc), GFP_KERNEL);
		if (!desc)
		return -ENOMEM;

		syscon = syscon_regmap_lookup_by_phandle(np, "syscon");
		@@ -198,7 +187,7 @@ static int pbias_regulator_probe(struct platform_device *pdev)
		cfg.regmap = syscon;
		cfg.dev = &pdev->dev;

		for (idx = 0; idx < PBIAS_NUM_REGS && data_idx < count; idx++) {
		for (idx = 0; idx < PBIAS_NUM_REGS && count; idx++) {
		if (!pbias_matches[idx].init_data \|\|
		!pbias_matches[idx].of_node)
		continue;
		@@ -207,41 +196,35 @@ static int pbias_regulator_probe(struct platform_device *pdev)
		if (!info)
		return -ENODEV;

		drvdata[data_idx].syscon = syscon;
		drvdata[data_idx].info = info;
		drvdata[data_idx].desc.name = info->name;
		drvdata[data_idx].desc.owner = THIS_MODULE;
		drvdata[data_idx].desc.type = REGULATOR_VOLTAGE;
		drvdata[data_idx].desc.ops = &pbias_regulator_voltage_ops;
		drvdata[data_idx].desc.volt_table = info->pbias_volt_table;
		drvdata[data_idx].desc.n_voltages = info->n_voltages;
		drvdata[data_idx].desc.enable_time = info->enable_time;
		drvdata[data_idx].desc.vsel_reg = offset;
		drvdata[data_idx].desc.vsel_mask = info->vmode;
		drvdata[data_idx].desc.enable_reg = offset;
		drvdata[data_idx].desc.enable_mask = info->enable_mask;
		drvdata[data_idx].desc.enable_val = info->enable;
		drvdata[data_idx].desc.disable_val = info->disable_val;
		desc->name = info->name;
		desc->owner = THIS_MODULE;
		desc->type = REGULATOR_VOLTAGE;
		desc->ops = &pbias_regulator_voltage_ops;
		desc->volt_table = info->pbias_volt_table;
		desc->n_voltages = info->n_voltages;
		desc->enable_time = info->enable_time;
		desc->vsel_reg = offset;
		desc->vsel_mask = info->vmode;
		desc->enable_reg = offset;
		desc->enable_mask = info->enable_mask;
		desc->enable_val = info->enable;
		desc->disable_val = info->disable_val;

		cfg.init_data = pbias_matches[idx].init_data;
		cfg.driver_data = &drvdata[data_idx];
		cfg.of_node = pbias_matches[idx].of_node;

		drvdata[data_idx].dev = devm_regulator_register(&pdev->dev,
		&drvdata[data_idx].desc, &cfg);
		if (IS_ERR(drvdata[data_idx].dev)) {
		ret = PTR_ERR(drvdata[data_idx].dev);
		rdev = devm_regulator_register(&pdev->dev, desc, &cfg);
		if (IS_ERR(rdev)) {
		ret = PTR_ERR(rdev);
		dev_err(&pdev->dev,
		"Failed to register regulator: %d\n", ret);
		goto err_regulator;
		return ret;
		}
		data_idx++;
		desc++;
		count--;
		}

		platform_set_drvdata(pdev, drvdata);

		err_regulator:
		return ret;
		return 0;
		}

		static struct platform_driver pbias_regulator_driver = {

Admin message