[media] si4713: switch to devm regulator API (d4471dec) · Commits · 戴 / test

drivers/media/radio/si4713/si4713.c

+57 −26

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@

	#include <linux/completion.h>		#include <linux/completion.h>
	#include <linux/delay.h>		#include <linux/delay.h>
			#include <linux/err.h>
	#include <linux/interrupt.h>		#include <linux/interrupt.h>
	#include <linux/i2c.h>		#include <linux/i2c.h>
	#include <linux/slab.h>		#include <linux/slab.h>
	@@ -366,13 +367,22 @@ static int si4713_powerup(struct si4713_device *sdev)
	if (sdev->power_state)		if (sdev->power_state)
	return 0;		return 0;

	if (sdev->supplies) {		if (sdev->vdd) {
	err = regulator_bulk_enable(sdev->supplies, sdev->supply_data);		err = regulator_enable(sdev->vdd);
	if (err) {		if (err) {
	v4l2_err(&sdev->sd, "Failed to enable supplies: %d\n", err);		v4l2_err(&sdev->sd, "Failed to enable vdd: %d\n", err);
	return err;		return err;
	}		}
	}		}

			if (sdev->vio) {
			err = regulator_enable(sdev->vio);
			if (err) {
			v4l2_err(&sdev->sd, "Failed to enable vio: %d\n", err);
			return err;
			}
			}

	if (gpio_is_valid(sdev->gpio_reset)) {		if (gpio_is_valid(sdev->gpio_reset)) {
	udelay(50);		udelay(50);
	gpio_set_value(sdev->gpio_reset, 1);		gpio_set_value(sdev->gpio_reset, 1);
	@@ -399,11 +409,18 @@ static int si4713_powerup(struct si4713_device *sdev)
	}		}
	if (gpio_is_valid(sdev->gpio_reset))		if (gpio_is_valid(sdev->gpio_reset))
	gpio_set_value(sdev->gpio_reset, 0);		gpio_set_value(sdev->gpio_reset, 0);
	if (sdev->supplies) {
	err = regulator_bulk_disable(sdev->supplies, sdev->supply_data);
			if (sdev->vdd) {
			err = regulator_disable(sdev->vdd);
	if (err)		if (err)
	v4l2_err(&sdev->sd,		v4l2_err(&sdev->sd, "Failed to disable vdd: %d\n", err);
	"Failed to disable supplies: %d\n", err);		}

			if (sdev->vio) {
			err = regulator_disable(sdev->vio);
			if (err)
			v4l2_err(&sdev->sd, "Failed to disable vio: %d\n", err);
	}		}

	return err;		return err;
	@@ -432,12 +449,21 @@ static int si4713_powerdown(struct si4713_device *sdev)
	v4l2_dbg(1, debug, &sdev->sd, "Device in reset mode\n");		v4l2_dbg(1, debug, &sdev->sd, "Device in reset mode\n");
	if (gpio_is_valid(sdev->gpio_reset))		if (gpio_is_valid(sdev->gpio_reset))
	gpio_set_value(sdev->gpio_reset, 0);		gpio_set_value(sdev->gpio_reset, 0);
	if (sdev->supplies) {
	err = regulator_bulk_disable(sdev->supplies,		if (sdev->vdd) {
	sdev->supply_data);		err = regulator_disable(sdev->vdd);
	if (err)		if (err) {
	v4l2_err(&sdev->sd,		v4l2_err(&sdev->sd,
	"Failed to disable supplies: %d\n", err);		"Failed to disable vdd: %d\n", err);
			}
			}

			if (sdev->vio) {
			err = regulator_disable(sdev->vio);
			if (err) {
			v4l2_err(&sdev->sd,
			"Failed to disable vio: %d\n", err);
			}
	}		}
	sdev->power_state = POWER_OFF;		sdev->power_state = POWER_OFF;
	}		}
	@@ -1422,7 +1448,7 @@ static int si4713_probe(struct i2c_client *client,
	struct si4713_device *sdev;		struct si4713_device *sdev;
	struct si4713_platform_data *pdata = client->dev.platform_data;		struct si4713_platform_data *pdata = client->dev.platform_data;
	struct v4l2_ctrl_handler *hdl;		struct v4l2_ctrl_handler *hdl;
	int rval, i;		int rval;

	sdev = kzalloc(sizeof(*sdev), GFP_KERNEL);		sdev = kzalloc(sizeof(*sdev), GFP_KERNEL);
	if (!sdev) {		if (!sdev) {
	@@ -1441,17 +1467,26 @@ static int si4713_probe(struct i2c_client *client,
	}		}
	sdev->gpio_reset = pdata->gpio_reset;		sdev->gpio_reset = pdata->gpio_reset;
	gpio_direction_output(sdev->gpio_reset, 0);		gpio_direction_output(sdev->gpio_reset, 0);
	sdev->supplies = pdata->supplies;
	}		}

	for (i = 0; i < sdev->supplies; i++)		sdev->vdd = devm_regulator_get_optional(&client->dev, "vdd");
	sdev->supply_data[i].supply = pdata->supply_names[i];		if (IS_ERR(sdev->vdd)) {
			rval = PTR_ERR(sdev->vdd);
			if (rval == -EPROBE_DEFER)
			goto exit;

	rval = regulator_bulk_get(&client->dev, sdev->supplies,		dev_dbg(&client->dev, "no vdd regulator found: %d\n", rval);
	sdev->supply_data);		sdev->vdd = NULL;
	if (rval) {		}
	dev_err(&client->dev, "Cannot get regulators: %d\n", rval);
	goto free_gpio;		sdev->vio = devm_regulator_get_optional(&client->dev, "vio");
			if (IS_ERR(sdev->vio)) {
			rval = PTR_ERR(sdev->vio);
			if (rval == -EPROBE_DEFER)
			goto exit;

			dev_dbg(&client->dev, "no vio regulator found: %d\n", rval);
			sdev->vio = NULL;
	}		}

	v4l2_i2c_subdev_init(&sdev->sd, client, &si4713_subdev_ops);		v4l2_i2c_subdev_init(&sdev->sd, client, &si4713_subdev_ops);
	@@ -1559,7 +1594,7 @@ static int si4713_probe(struct i2c_client *client,
	client->name, sdev);		client->name, sdev);
	if (rval < 0) {		if (rval < 0) {
	v4l2_err(&sdev->sd, "Could not request IRQ\n");		v4l2_err(&sdev->sd, "Could not request IRQ\n");
	goto put_reg;		goto free_ctrls;
	}		}
	v4l2_dbg(1, debug, &sdev->sd, "IRQ requested.\n");		v4l2_dbg(1, debug, &sdev->sd, "IRQ requested.\n");
	} else {		} else {
	@@ -1579,9 +1614,6 @@ free_irq:
	free_irq(client->irq, sdev);		free_irq(client->irq, sdev);
	free_ctrls:		free_ctrls:
	v4l2_ctrl_handler_free(hdl);		v4l2_ctrl_handler_free(hdl);
	put_reg:
	regulator_bulk_free(sdev->supplies, sdev->supply_data);
	free_gpio:
	if (gpio_is_valid(sdev->gpio_reset))		if (gpio_is_valid(sdev->gpio_reset))
	gpio_free(sdev->gpio_reset);		gpio_free(sdev->gpio_reset);
	free_sdev:		free_sdev:
	@@ -1604,7 +1636,6 @@ static int si4713_remove(struct i2c_client *client)

	v4l2_device_unregister_subdev(sd);		v4l2_device_unregister_subdev(sd);
	v4l2_ctrl_handler_free(sd->ctrl_handler);		v4l2_ctrl_handler_free(sd->ctrl_handler);
	regulator_bulk_free(sdev->supplies, sdev->supply_data);
	if (gpio_is_valid(sdev->gpio_reset))		if (gpio_is_valid(sdev->gpio_reset))
	gpio_free(sdev->gpio_reset);		gpio_free(sdev->gpio_reset);
	kfree(sdev);		kfree(sdev);

drivers/media/radio/si4713/si4713.h

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -190,8 +190,6 @@
	#define MIN_ACOMP_THRESHOLD (-40)		#define MIN_ACOMP_THRESHOLD (-40)
	#define MAX_ACOMP_GAIN 20		#define MAX_ACOMP_GAIN 20

	#define SI4713_NUM_SUPPLIES 2

	/*		/*
	* si4713_device - private data		* si4713_device - private data
	*/		*/
	@@ -236,8 +234,8 @@ struct si4713_device {
	struct v4l2_ctrl *tune_ant_cap;		struct v4l2_ctrl *tune_ant_cap;
	};		};
	struct completion work;		struct completion work;
	unsigned supplies;		struct regulator *vdd;
	struct regulator_bulk_data supply_data[SI4713_NUM_SUPPLIES];		struct regulator *vio;
	int gpio_reset;		int gpio_reset;
	u32 power_state;		u32 power_state;
	u32 rds_enabled;		u32 rds_enabled;

Admin message