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

Commit 6705e127 authored by William Breathitt Gray's avatar William Breathitt Gray Committed by Jonathan Cameron
Browse files

iio: stx104: Remove unneeded struct stx104_dev code 



The stx104_dev structure was used to hold private data for use in the
stx104_remove function. Now that the stx104_remove function is gone, the
stx104_dev structure and relevant code is no longer needed. This patch
removes the unnecessary code.

Signed-off-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 2763ea05

drivers/iio/adc/stx104.c

+0 −19
Original line number Diff line number Diff line
@@ -76,16 +76,6 @@ struct stx104_gpio { 
	unsigned int out_state;

};



/**

 * struct stx104_dev - STX104 device private data structure

 * @indio_dev:	IIO device

 * @chip:	instance of the gpio_chip

 */

struct stx104_dev {

	struct iio_dev *indio_dev;

	struct gpio_chip *chip;

};



static int stx104_read_raw(struct iio_dev *indio_dev,

	struct iio_chan_spec const *chan, int *val, int *val2, long mask)

{
@@ -271,7 +261,6 @@ static int stx104_probe(struct device *dev, unsigned int id) 
	struct iio_dev *indio_dev;

	struct stx104_iio *priv;

	struct stx104_gpio *stx104gpio;

	struct stx104_dev *stx104dev;

	int err;



	indio_dev = devm_iio_device_alloc(dev, sizeof(*priv));
@@ -282,10 +271,6 @@ static int stx104_probe(struct device *dev, unsigned int id) 
	if (!stx104gpio)

		return -ENOMEM;



	stx104dev = devm_kzalloc(dev, sizeof(*stx104dev), GFP_KERNEL);

	if (!stx104dev)

		return -ENOMEM;



	if (!devm_request_region(dev, base[id], STX104_EXTENT,

		dev_name(dev))) {

		dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",
@@ -335,10 +320,6 @@ static int stx104_probe(struct device *dev, unsigned int id) 


	spin_lock_init(&stx104gpio->lock);



	stx104dev->indio_dev = indio_dev;

	stx104dev->chip = &stx104gpio->chip;

	dev_set_drvdata(dev, stx104dev);



	err = devm_gpiochip_add_data(dev, &stx104gpio->chip, stx104gpio);

	if (err) {

		dev_err(dev, "GPIO registering failed (%d)\n", err);