aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-mt65xx.c
diff options
context:
space:
mode:
authorLeilk Liu <leilk.liu@mediatek.com>2015-08-18 23:37:57 -0400
committerMark Brown <broonie@kernel.org>2015-08-19 13:24:18 -0400
commitc5e5cd28d7c5a18d6da6575957dd0c5243ac3e7b (patch)
tree56597a042a4602cad7b78a6295ddaef1a87f7730 /drivers/spi/spi-mt65xx.c
parent39ba928f8b34720b60c68d4c1bb274ae219ab39e (diff)
spi: mediatek: remove redundant clock in prepare_hardware/unprepare_hardware
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>
Diffstat (limited to 'drivers/spi/spi-mt65xx.c')
-rw-r--r--drivers/spi/spi-mt65xx.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index 62baaad244af..546d70cc1e21 100644
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -186,13 +186,6 @@ static int mtk_spi_prepare_hardware(struct spi_master *master)
186 struct spi_transfer *trans; 186 struct spi_transfer *trans;
187 struct mtk_spi *mdata = spi_master_get_devdata(master); 187 struct mtk_spi *mdata = spi_master_get_devdata(master);
188 struct spi_message *msg = master->cur_msg; 188 struct spi_message *msg = master->cur_msg;
189 int ret;
190
191 ret = clk_prepare_enable(mdata->spi_clk);
192 if (ret < 0) {
193 dev_err(&master->dev, "failed to enable clock (%d)\n", ret);
194 return ret;
195 }
196 189
197 trans = list_first_entry(&msg->transfers, struct spi_transfer, 190 trans = list_first_entry(&msg->transfers, struct spi_transfer,
198 transfer_list); 191 transfer_list);
@@ -201,15 +194,6 @@ static int mtk_spi_prepare_hardware(struct spi_master *master)
201 mtk_spi_reset(mdata); 194 mtk_spi_reset(mdata);
202 } 195 }
203 196
204 return ret;
205}
206
207static int mtk_spi_unprepare_hardware(struct spi_master *master)
208{
209 struct mtk_spi *mdata = spi_master_get_devdata(master);
210
211 clk_disable_unprepare(mdata->spi_clk);
212
213 return 0; 197 return 0;
214} 198}
215 199
@@ -541,7 +525,6 @@ static int mtk_spi_probe(struct platform_device *pdev)
541 525
542 master->set_cs = mtk_spi_set_cs; 526 master->set_cs = mtk_spi_set_cs;
543 master->prepare_transfer_hardware = mtk_spi_prepare_hardware; 527 master->prepare_transfer_hardware = mtk_spi_prepare_hardware;
544 master->unprepare_transfer_hardware = mtk_spi_unprepare_hardware;
545 master->prepare_message = mtk_spi_prepare_message; 528 master->prepare_message = mtk_spi_prepare_message;
546 master->transfer_one = mtk_spi_transfer_one; 529 master->transfer_one = mtk_spi_transfer_one;
547 master->can_dma = mtk_spi_can_dma; 530 master->can_dma = mtk_spi_can_dma;