Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7074e1d4 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio:dds:ad5930 Fix attr group location + allocate state with iio_dev 



The main attribute group was placed under driver name for some reason.

Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cada11fa

drivers/staging/iio/dds/ad5930.c

+12 −25
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ struct ad5903_config { 




struct ad5930_state {

struct ad5930_state {

	struct mutex lock;

	struct mutex lock;

	struct iio_dev *idev;

	struct spi_device *sdev;

	struct spi_device *sdev;

};

};
@@ -49,7 +48,7 @@ static ssize_t ad5930_set_parameter(struct device *dev, 
	int ret;

	int ret;

	struct ad5903_config *config = (struct ad5903_config *)buf;

	struct ad5903_config *config = (struct ad5903_config *)buf;

	struct iio_dev *idev = dev_get_drvdata(dev);

	struct iio_dev *idev = dev_get_drvdata(dev);

	struct ad5930_state *st = idev->dev_data;

	struct ad5930_state *st = iio_priv(idev);





	config->control = (config->control & ~value_mask);

	config->control = (config->control & ~value_mask);

	config->incnum = (config->control & ~value_mask) | (1 << addr_shift);

	config->incnum = (config->control & ~value_mask) | (1 << addr_shift);
@@ -83,42 +82,35 @@ static struct attribute *ad5930_attributes[] = { 
};

};





static const struct attribute_group ad5930_attribute_group = {

static const struct attribute_group ad5930_attribute_group = {

	.name = DRV_NAME,

	.attrs = ad5930_attributes,

	.attrs = ad5930_attributes,

};

};





static const struct iio_info ad5930_info = {

static const struct iio_info ad5930_info = {

	.attrs = &ad5930_attribute_group,

	.attrs = &ad5930_attribute_group,



	.driver_module = THIS_MODULE,

	.driver_module = THIS_MODULE,

};

};





static int __devinit ad5930_probe(struct spi_device *spi)

static int __devinit ad5930_probe(struct spi_device *spi)

{

{

	struct ad5930_state *st;

	struct ad5930_state *st;

	struct iio_dev *idev;

	int ret = 0;

	int ret = 0;





	st = kzalloc(sizeof(*st), GFP_KERNEL);

	idev = iio_allocate_device(sizeof(*st));

	if (st == NULL) {

	if (idev == NULL) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto error_ret;

		goto error_ret;

	}

	}

	spi_set_drvdata(spi, st);

	spi_set_drvdata(spi, idev);

	st = iio_priv(idev);





	mutex_init(&st->lock);

	mutex_init(&st->lock);

	st->sdev = spi;

	st->sdev = spi;

	idev->dev.parent = &spi->dev;

	idev->info = &ad5930_info;

	idev->modes = INDIO_DIRECT_MODE;





	st->idev = iio_allocate_device(0);

	ret = iio_device_register(idev);

	if (st->idev == NULL) {

		ret = -ENOMEM;

		goto error_free_st;

	}

	st->idev->dev.parent = &spi->dev;

	st->idev->dev_data = (void *)(st);

	st->idev->info = &ad5930_info;

	st->idev->modes = INDIO_DIRECT_MODE;



	ret = iio_device_register(st->idev);

	if (ret)

	if (ret)

		goto error_free_dev;

		goto error_free_dev;

	spi->max_speed_hz = 2000000;

	spi->max_speed_hz = 2000000;
@@ -129,19 +121,14 @@ static int __devinit ad5930_probe(struct spi_device *spi) 
	return 0;

	return 0;





error_free_dev:

error_free_dev:

	iio_free_device(st->idev);

	iio_free_device(idev);

error_free_st:

	kfree(st);

error_ret:

error_ret:

	return ret;

	return ret;

}

}





static int __devexit ad5930_remove(struct spi_device *spi)

static int __devexit ad5930_remove(struct spi_device *spi)

{

{

	struct ad5930_state *st = spi_get_drvdata(spi);

	iio_device_unregister(spi_get_drvdata(spi));



	iio_device_unregister(st->idev);

	kfree(st);





	return 0;

	return 0;

}

}