staging:iio:dds:ad9832: allocate chip state with iio_dev and use iio_priv to access. (39f3b32e) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/staging/iio/dds/ad9832.c

+32 −37

Original line number	Original line	Diff line number	Diff line
	@@ -77,7 +77,7 @@ static ssize_t ad9832_write(struct device *dev,
	size_t len)		size_t len)
	{		{
	struct iio_dev *dev_info = dev_get_drvdata(dev);		struct iio_dev *dev_info = dev_get_drvdata(dev);
	struct ad9832_state *st = dev_info->dev_data;		struct ad9832_state *st = iio_priv(dev_info);
	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);		struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
	int ret;		int ret;
	long val;		long val;
	@@ -203,7 +203,9 @@ static const struct iio_info ad9832_info = {
	static int __devinit ad9832_probe(struct spi_device *spi)		static int __devinit ad9832_probe(struct spi_device *spi)
	{		{
	struct ad9832_platform_data *pdata = spi->dev.platform_data;		struct ad9832_platform_data *pdata = spi->dev.platform_data;
			struct iio_dev *indio_dev;
	struct ad9832_state *st;		struct ad9832_state *st;
			struct regulator *reg;
	int ret;		int ret;

	if (!pdata) {		if (!pdata) {
	@@ -211,35 +213,28 @@ static int __devinit ad9832_probe(struct spi_device *spi)
	return -ENODEV;		return -ENODEV;
	}		}

	st = kzalloc(sizeof(*st), GFP_KERNEL);		reg = regulator_get(&spi->dev, "vcc");
	if (st == NULL) {		if (!IS_ERR(reg)) {
	ret = -ENOMEM;		ret = regulator_enable(reg);
	goto error_ret;
	}

	st->reg = regulator_get(&spi->dev, "vcc");
	if (!IS_ERR(st->reg)) {
	ret = regulator_enable(st->reg);
	if (ret)		if (ret)
	goto error_put_reg;		goto error_put_reg;
	}		}

	st->mclk = pdata->mclk;		indio_dev = iio_allocate_device(sizeof(*st));
			if (indio_dev == NULL) {
	spi_set_drvdata(spi, st);
	st->spi = spi;

	st->indio_dev = iio_allocate_device(0);
	if (st->indio_dev == NULL) {
	ret = -ENOMEM;		ret = -ENOMEM;
	goto error_disable_reg;		goto error_disable_reg;
	}		}
			spi_set_drvdata(spi, indio_dev);
			st = iio_priv(indio_dev);
			st->reg = reg;
			st->mclk = pdata->mclk;
			st->spi = spi;

	st->indio_dev->dev.parent = &spi->dev;		indio_dev->dev.parent = &spi->dev;
	st->indio_dev->name = spi_get_device_id(spi)->name;		indio_dev->name = spi_get_device_id(spi)->name;
	st->indio_dev->info = &ad9832_info;		indio_dev->info = &ad9832_info;
	st->indio_dev->dev_data = (void *) st;		indio_dev->modes = INDIO_DIRECT_MODE;
	st->indio_dev->modes = INDIO_DIRECT_MODE;

	/* Setup default messages */		/* Setup default messages */

	@@ -310,35 +305,35 @@ static int __devinit ad9832_probe(struct spi_device *spi)
	if (ret)		if (ret)
	goto error_free_device;		goto error_free_device;

	ret = iio_device_register(st->indio_dev);		ret = iio_device_register(indio_dev);
	if (ret)		if (ret)
	goto error_free_device;		goto error_free_device;

	return 0;		return 0;

	error_free_device:		error_free_device:
	iio_free_device(st->indio_dev);		iio_free_device(indio_dev);
	error_disable_reg:		error_disable_reg:
	if (!IS_ERR(st->reg))		if (!IS_ERR(reg))
	regulator_disable(st->reg);		regulator_disable(reg);
	error_put_reg:		error_put_reg:
	if (!IS_ERR(st->reg))		if (!IS_ERR(reg))
	regulator_put(st->reg);		regulator_put(reg);
	kfree(st);
	error_ret:
	return ret;		return ret;
	}		}

	static int __devexit ad9832_remove(struct spi_device *spi)		static int __devexit ad9832_remove(struct spi_device *spi)
	{		{
	struct ad9832_state *st = spi_get_drvdata(spi);		struct iio_dev *indio_dev = spi_get_drvdata(spi);
			struct ad9832_state *st = iio_priv(indio_dev);
	iio_device_unregister(st->indio_dev);		struct regulator *reg = st->reg;
	if (!IS_ERR(st->reg)) {
	regulator_disable(st->reg);		iio_device_unregister(indio_dev);
	regulator_put(st->reg);		if (!IS_ERR(reg)) {
			regulator_disable(reg);
			regulator_put(reg);
	}		}
	kfree(st);
	return 0;		return 0;
	}		}

drivers/staging/iio/dds/ad9832.h

+0 −2

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

	/**		/**
	* struct ad9832_state - driver instance specific data		* struct ad9832_state - driver instance specific data
	* @indio_dev: the industrial I/O device
	* @spi: spi_device		* @spi: spi_device
	* @reg: supply regulator		* @reg: supply regulator
	* @mclk: external master clock		* @mclk: external master clock
	@@ -76,7 +75,6 @@
	*/		*/

	struct ad9832_state {		struct ad9832_state {
	struct iio_dev *indio_dev;
	struct spi_device *spi;		struct spi_device *spi;
	struct regulator *reg;		struct regulator *reg;
	unsigned long mclk;		unsigned long mclk;