diff options
Diffstat (limited to 'drivers/mfd/ezx-pcap.c')
-rw-r--r-- | drivers/mfd/ezx-pcap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c index 5502106ad515..7245b0c5b794 100644 --- a/drivers/mfd/ezx-pcap.c +++ b/drivers/mfd/ezx-pcap.c | |||
@@ -177,7 +177,7 @@ static void pcap_msr_work(struct work_struct *work) | |||
177 | static void pcap_isr_work(struct work_struct *work) | 177 | static void pcap_isr_work(struct work_struct *work) |
178 | { | 178 | { |
179 | struct pcap_chip *pcap = container_of(work, struct pcap_chip, isr_work); | 179 | struct pcap_chip *pcap = container_of(work, struct pcap_chip, isr_work); |
180 | struct pcap_platform_data *pdata = pcap->spi->dev.platform_data; | 180 | struct pcap_platform_data *pdata = dev_get_platdata(&pcap->spi->dev); |
181 | u32 msr, isr, int_sel, service; | 181 | u32 msr, isr, int_sel, service; |
182 | int irq; | 182 | int irq; |
183 | 183 | ||
@@ -394,7 +394,7 @@ static int pcap_add_subdev(struct pcap_chip *pcap, | |||
394 | static int ezx_pcap_remove(struct spi_device *spi) | 394 | static int ezx_pcap_remove(struct spi_device *spi) |
395 | { | 395 | { |
396 | struct pcap_chip *pcap = spi_get_drvdata(spi); | 396 | struct pcap_chip *pcap = spi_get_drvdata(spi); |
397 | struct pcap_platform_data *pdata = spi->dev.platform_data; | 397 | struct pcap_platform_data *pdata = dev_get_platdata(&spi->dev); |
398 | int i, adc_irq; | 398 | int i, adc_irq; |
399 | 399 | ||
400 | /* remove all registered subdevs */ | 400 | /* remove all registered subdevs */ |
@@ -420,7 +420,7 @@ static int ezx_pcap_remove(struct spi_device *spi) | |||
420 | 420 | ||
421 | static int ezx_pcap_probe(struct spi_device *spi) | 421 | static int ezx_pcap_probe(struct spi_device *spi) |
422 | { | 422 | { |
423 | struct pcap_platform_data *pdata = spi->dev.platform_data; | 423 | struct pcap_platform_data *pdata = dev_get_platdata(&spi->dev); |
424 | struct pcap_chip *pcap; | 424 | struct pcap_chip *pcap; |
425 | int i, adc_irq; | 425 | int i, adc_irq; |
426 | int ret = -ENODEV; | 426 | int ret = -ENODEV; |