]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
spi: mediatek: remove redundant clock in prepare_hardware/unprepare_hardware
authorLeilk Liu <leilk.liu@mediatek.com>
Wed, 19 Aug 2015 03:37:57 +0000 (11:37 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 19 Aug 2015 17:24:18 +0000 (10:24 -0700)
clock in prepare_hardware/unprepare_hardware is redundant
with pm_runtime, so remove them.

Signed-off-by: Leilk Liu <leilk.liu@mediatek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-mt65xx.c

index 62baaad244af3030d699429266d32ff17fb82119..546d70cc1e2182990ef0559105ec84854822cec4 100644 (file)
@@ -186,13 +186,6 @@ static int mtk_spi_prepare_hardware(struct spi_master *master)
        struct spi_transfer *trans;
        struct mtk_spi *mdata = spi_master_get_devdata(master);
        struct spi_message *msg = master->cur_msg;
-       int ret;
-
-       ret = clk_prepare_enable(mdata->spi_clk);
-       if (ret < 0) {
-               dev_err(&master->dev, "failed to enable clock (%d)\n", ret);
-               return ret;
-       }
 
        trans = list_first_entry(&msg->transfers, struct spi_transfer,
                                 transfer_list);
@@ -201,15 +194,6 @@ static int mtk_spi_prepare_hardware(struct spi_master *master)
                mtk_spi_reset(mdata);
        }
 
-       return ret;
-}
-
-static int mtk_spi_unprepare_hardware(struct spi_master *master)
-{
-       struct mtk_spi *mdata = spi_master_get_devdata(master);
-
-       clk_disable_unprepare(mdata->spi_clk);
-
        return 0;
 }
 
@@ -541,7 +525,6 @@ static int mtk_spi_probe(struct platform_device *pdev)
 
        master->set_cs = mtk_spi_set_cs;
        master->prepare_transfer_hardware = mtk_spi_prepare_hardware;
-       master->unprepare_transfer_hardware = mtk_spi_unprepare_hardware;
        master->prepare_message = mtk_spi_prepare_message;
        master->transfer_one = mtk_spi_transfer_one;
        master->can_dma = mtk_spi_can_dma;