From: Jingoo Han Date: Sat, 6 Apr 2013 06:43:48 +0000 (+0900) Subject: mfd: ezx-pcap: Use spi_get_drvdata() and spi_set_drvdata() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7c478b405837e91f68208b423acd20dad184998c;p=deliverable%2Flinux.git mfd: ezx-pcap: 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: Jingoo Han Signed-off-by: Samuel Ortiz --- diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c index f83cc3da9308..5502106ad515 100644 --- a/drivers/mfd/ezx-pcap.c +++ b/drivers/mfd/ezx-pcap.c @@ -393,7 +393,7 @@ static int pcap_add_subdev(struct pcap_chip *pcap, static int ezx_pcap_remove(struct spi_device *spi) { - struct pcap_chip *pcap = dev_get_drvdata(&spi->dev); + struct pcap_chip *pcap = spi_get_drvdata(spi); struct pcap_platform_data *pdata = spi->dev.platform_data; int i, adc_irq; @@ -439,7 +439,7 @@ static int ezx_pcap_probe(struct spi_device *spi) mutex_init(&pcap->adc_mutex); INIT_WORK(&pcap->isr_work, pcap_isr_work); INIT_WORK(&pcap->msr_work, pcap_msr_work); - dev_set_drvdata(&spi->dev, pcap); + spi_set_drvdata(spi, pcap); /* setup spi */ spi->bits_per_word = 32;