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

Commit e1793c69 authored by Jingoo Han's avatar Jingoo Han Committed by Dmitry Torokhov
Browse files

Input: ad7877 - use spi_get_drvdata() and spi_set_drvdata() 



Use the wrapper functions for getting and setting the driver data using
spi_device instead of using dev_{get|set}_drvdata with &spi->dev, so we
can directly pass a struct spi_device.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent c12454fa

drivers/input/touchscreen/ad7877.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -273,7 +273,7 @@ static int ad7877_write(struct spi_device *spi, u16 reg, u16 val) 




static int ad7877_read_adc(struct spi_device *spi, unsigned command)

static int ad7877_read_adc(struct spi_device *spi, unsigned command)

{

{

	struct ad7877 *ts = dev_get_drvdata(&spi->dev);

	struct ad7877 *ts = spi_get_drvdata(spi);

	struct ser_req *req;

	struct ser_req *req;

	int status;

	int status;

	int sample;

	int sample;
@@ -720,7 +720,7 @@ static int ad7877_probe(struct spi_device *spi) 
		goto err_free_mem;

		goto err_free_mem;

	}

	}





	dev_set_drvdata(&spi->dev, ts);

	spi_set_drvdata(spi, ts);

	ts->spi = spi;

	ts->spi = spi;

	ts->input = input_dev;

	ts->input = input_dev;
@@ -806,13 +806,13 @@ static int ad7877_probe(struct spi_device *spi) 
err_free_mem:

err_free_mem:

	input_free_device(input_dev);

	input_free_device(input_dev);

	kfree(ts);

	kfree(ts);

	dev_set_drvdata(&spi->dev, NULL);

	spi_set_drvdata(spi, NULL);

	return err;

	return err;

}

}





static int ad7877_remove(struct spi_device *spi)

static int ad7877_remove(struct spi_device *spi)

{

{

	struct ad7877 *ts = dev_get_drvdata(&spi->dev);

	struct ad7877 *ts = spi_get_drvdata(spi);





	sysfs_remove_group(&spi->dev.kobj, &ad7877_attr_group);

	sysfs_remove_group(&spi->dev.kobj, &ad7877_attr_group);
@@ -823,7 +823,7 @@ static int ad7877_remove(struct spi_device *spi) 
	kfree(ts);

	kfree(ts);





	dev_dbg(&spi->dev, "unregistered touchscreen\n");

	dev_dbg(&spi->dev, "unregistered touchscreen\n");

	dev_set_drvdata(&spi->dev, NULL);

	spi_set_drvdata(spi, NULL);





	return 0;

	return 0;

}

}