Skip to content

Commit e2a0ba5

Browse files
Geert Uytterhoevenbroonie
Geert Uytterhoeven
authored andcommitted
spi: sh-msiof: Convert to spi core auto_runtime_pm framework
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Signed-off-by: Mark Brown <broonie@linaro.org>
1 parent f9ee821 commit e2a0ba5

File tree

1 file changed

+1
-24
lines changed

1 file changed

+1
-24
lines changed

drivers/spi/spi-sh-msiof.c

+1-24
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,6 @@ static int sh_msiof_prepare_message(struct spi_master *master,
449449
struct sh_msiof_spi_priv *p = spi_master_get_devdata(master);
450450
const struct spi_device *spi = msg->spi;
451451

452-
pm_runtime_get_sync(&p->pdev->dev);
453-
clk_enable(p->clk);
454-
455452
/* Configure pins before asserting CS */
456453
sh_msiof_spi_set_pin_regs(p, !!(spi->mode & SPI_CPOL),
457454
!!(spi->mode & SPI_CPHA),
@@ -461,16 +458,6 @@ static int sh_msiof_prepare_message(struct spi_master *master,
461458
return 0;
462459
}
463460

464-
static int sh_msiof_unprepare_message(struct spi_master *master,
465-
struct spi_message *msg)
466-
{
467-
struct sh_msiof_spi_priv *p = spi_master_get_devdata(master);
468-
469-
clk_disable(p->clk);
470-
pm_runtime_put(&p->pdev->dev);
471-
return 0;
472-
}
473-
474461
static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p,
475462
void (*tx_fifo)(struct sh_msiof_spi_priv *,
476463
const void *, int, int),
@@ -743,12 +730,6 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
743730
goto err1;
744731
}
745732

746-
ret = clk_prepare(p->clk);
747-
if (ret < 0) {
748-
dev_err(&pdev->dev, "unable to prepare clock\n");
749-
goto err1;
750-
}
751-
752733
p->pdev = pdev;
753734
pm_runtime_enable(&pdev->dev);
754735

@@ -769,8 +750,8 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
769750
master->num_chipselect = p->info->num_chipselect;
770751
master->setup = sh_msiof_spi_setup;
771752
master->prepare_message = sh_msiof_prepare_message;
772-
master->unprepare_message = sh_msiof_unprepare_message;
773753
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32);
754+
master->auto_runtime_pm = true;
774755
master->transfer_one = sh_msiof_transfer_one;
775756

776757
ret = devm_spi_register_master(&pdev->dev, master);
@@ -783,18 +764,14 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
783764

784765
err2:
785766
pm_runtime_disable(&pdev->dev);
786-
clk_unprepare(p->clk);
787767
err1:
788768
spi_master_put(master);
789769
return ret;
790770
}
791771

792772
static int sh_msiof_spi_remove(struct platform_device *pdev)
793773
{
794-
struct sh_msiof_spi_priv *p = platform_get_drvdata(pdev);
795-
796774
pm_runtime_disable(&pdev->dev);
797-
clk_unprepare(p->clk);
798775
return 0;
799776
}
800777

0 commit comments

Comments
 (0)