spi/hspi: Convert to core runtime PM
authorMark Brown <broonie@linaro.org>
Sun, 28 Jul 2013 14:35:36 +0000 (15:35 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 29 Jul 2013 17:00:21 +0000 (18:00 +0100)
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-sh-hspi.c

index 716edf999538ac78a3c38d85d39917e83785a6e8..b95d6a9fb80ed05ee2b717be0de41199dd55ae97 100644 (file)
@@ -99,21 +99,6 @@ static int hspi_status_check_timeout(struct hspi_priv *hspi, u32 mask, u32 val)
 /*
  *             spi master function
  */
-static int hspi_prepare_transfer(struct spi_master *master)
-{
-       struct hspi_priv *hspi = spi_master_get_devdata(master);
-
-       pm_runtime_get_sync(hspi->dev);
-       return 0;
-}
-
-static int hspi_unprepare_transfer(struct spi_master *master)
-{
-       struct hspi_priv *hspi = spi_master_get_devdata(master);
-
-       pm_runtime_put_sync(hspi->dev);
-       return 0;
-}
 
 #define hspi_hw_cs_enable(hspi)                hspi_hw_cs_ctrl(hspi, 0)
 #define hspi_hw_cs_disable(hspi)       hspi_hw_cs_ctrl(hspi, 1)
@@ -316,9 +301,8 @@ static int hspi_probe(struct platform_device *pdev)
        master->setup           = hspi_setup;
        master->cleanup         = hspi_cleanup;
        master->mode_bits       = SPI_CPOL | SPI_CPHA;
-       master->prepare_transfer_hardware       = hspi_prepare_transfer;
+       master->auto_runtime_pm = true;
        master->transfer_one_message            = hspi_transfer_one_message;
-       master->unprepare_transfer_hardware     = hspi_unprepare_transfer;
        ret = spi_register_master(master);
        if (ret < 0) {
                dev_err(&pdev->dev, "spi_register_master error.\n");