Skip to content

Commit

Permalink
Input: ad7877 - use spi_get_drvdata() and spi_set_drvdata()
Browse files Browse the repository at this point in the history
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: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Jingoo Han authored and Dmitry Torokhov committed Apr 8, 2013
1 parent c12454f commit e1793c6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/input/touchscreen/ad7877.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
struct ad7877 *ts = dev_get_drvdata(&spi->dev);
struct ad7877 *ts = spi_get_drvdata(spi);
struct ser_req *req;
int status;
int sample;
Expand Down Expand Up @@ -720,7 +720,7 @@ static int ad7877_probe(struct spi_device *spi)
goto err_free_mem;
}

dev_set_drvdata(&spi->dev, ts);
spi_set_drvdata(spi, ts);
ts->spi = spi;
ts->input = input_dev;

Expand Down Expand Up @@ -806,13 +806,13 @@ static int ad7877_probe(struct spi_device *spi)
err_free_mem:
input_free_device(input_dev);
kfree(ts);
dev_set_drvdata(&spi->dev, NULL);
spi_set_drvdata(spi, NULL);
return err;
}

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);

Expand All @@ -823,7 +823,7 @@ static int ad7877_remove(struct spi_device *spi)
kfree(ts);

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

return 0;
}
Expand Down

0 comments on commit e1793c6

Please sign in to comment.