aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-02-13 20:54:25 -0500
committerMark Brown <broonie@linaro.org>2014-03-04 22:54:09 -0500
commit8bd313453736d8efa82afee01c899774b29362ac (patch)
treec864a1df01873d2e1c3127e6bb62149447d72608
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
spi: coldfire-qspi: Remove unused dev field from struct mcfqspi
Also remove unused *res variable in mcfqspi_remove(). Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/spi/spi-coldfire-qspi.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c
index cabed8f9119e..e35294239034 100644
--- a/drivers/spi/spi-coldfire-qspi.c
+++ b/drivers/spi/spi-coldfire-qspi.c
@@ -77,8 +77,6 @@ struct mcfqspi {
77 struct mcfqspi_cs_control *cs_control; 77 struct mcfqspi_cs_control *cs_control;
78 78
79 wait_queue_head_t waitq; 79 wait_queue_head_t waitq;
80
81 struct device *dev;
82}; 80};
83 81
84static void mcfqspi_wr_qmr(struct mcfqspi *mcfqspi, u16 val) 82static void mcfqspi_wr_qmr(struct mcfqspi *mcfqspi, u16 val)
@@ -436,7 +434,6 @@ static int mcfqspi_probe(struct platform_device *pdev)
436 } 434 }
437 435
438 init_waitqueue_head(&mcfqspi->waitq); 436 init_waitqueue_head(&mcfqspi->waitq);
439 mcfqspi->dev = &pdev->dev;
440 437
441 master->mode_bits = SPI_CS_HIGH | SPI_CPOL | SPI_CPHA; 438 master->mode_bits = SPI_CS_HIGH | SPI_CPOL | SPI_CPHA;
442 master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 16); 439 master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 16);
@@ -451,7 +448,7 @@ static int mcfqspi_probe(struct platform_device *pdev)
451 dev_dbg(&pdev->dev, "spi_register_master failed\n"); 448 dev_dbg(&pdev->dev, "spi_register_master failed\n");
452 goto fail2; 449 goto fail2;
453 } 450 }
454 pm_runtime_enable(mcfqspi->dev); 451 pm_runtime_enable(&pdev->dev);
455 452
456 dev_info(&pdev->dev, "Coldfire QSPI bus driver\n"); 453 dev_info(&pdev->dev, "Coldfire QSPI bus driver\n");
457 454
@@ -473,9 +470,8 @@ static int mcfqspi_remove(struct platform_device *pdev)
473{ 470{
474 struct spi_master *master = platform_get_drvdata(pdev); 471 struct spi_master *master = platform_get_drvdata(pdev);
475 struct mcfqspi *mcfqspi = spi_master_get_devdata(master); 472 struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
476 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
477 473
478 pm_runtime_disable(mcfqspi->dev); 474 pm_runtime_disable(&pdev->dev);
479 /* disable the hardware (set the baud rate to 0) */ 475 /* disable the hardware (set the baud rate to 0) */
480 mcfqspi_wr_qmr(mcfqspi, MCFQSPI_QMR_MSTR); 476 mcfqspi_wr_qmr(mcfqspi, MCFQSPI_QMR_MSTR);
481 477