From: Geert Uytterhoeven <geert@linux-m68k.org> To: Mark Brown <broonie@kernel.org> Cc: linux-spi@vger.kernel.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert+renesas@linux-m68k.org>, Magnus Damm <magnus.damm@gmail.com> Subject: [PATCH 2/3] spi: sh-msiof: Convert to spi core auto_runtime_pm framework Date: Tue, 11 Mar 2014 09:59:11 +0000 [thread overview] Message-ID: <1394531952-3905-2-git-send-email-geert@linux-m68k.org> (raw) In-Reply-To: <1394531952-3905-1-git-send-email-geert@linux-m68k.org> From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Cc: Magnus Damm <magnus.damm@gmail.com> --- drivers/spi/spi-sh-msiof.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 739eb2f12ecc..e850d03e7190 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -448,9 +448,6 @@ static int sh_msiof_prepare_message(struct spi_master *master, struct sh_msiof_spi_priv *p = spi_master_get_devdata(master); const struct spi_device *spi = msg->spi; - pm_runtime_get_sync(&p->pdev->dev); - clk_enable(p->clk); - /* Configure pins before asserting CS */ sh_msiof_spi_set_pin_regs(p, !!(spi->mode & SPI_CPOL), !!(spi->mode & SPI_CPHA), @@ -460,16 +457,6 @@ static int sh_msiof_prepare_message(struct spi_master *master, return 0; } -static int sh_msiof_unprepare_message(struct spi_master *master, - struct spi_message *msg) -{ - struct sh_msiof_spi_priv *p = spi_master_get_devdata(master); - - clk_disable(p->clk); - pm_runtime_put(&p->pdev->dev); - return 0; -} - static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p, void (*tx_fifo)(struct sh_msiof_spi_priv *, const void *, int, int), @@ -742,12 +729,6 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) goto err1; } - ret = clk_prepare(p->clk); - if (ret < 0) { - dev_err(&pdev->dev, "unable to prepare clock\n"); - goto err1; - } - p->pdev = pdev; pm_runtime_enable(&pdev->dev); @@ -768,8 +749,8 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) master->num_chipselect = p->info->num_chipselect; master->setup = sh_msiof_spi_setup; master->prepare_message = sh_msiof_prepare_message; - master->unprepare_message = sh_msiof_unprepare_message; master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32); + master->auto_runtime_pm = true; master->transfer_one = sh_msiof_transfer_one; ret = devm_spi_register_master(&pdev->dev, master); @@ -782,7 +763,6 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) err2: pm_runtime_disable(&pdev->dev); - clk_unprepare(p->clk); err1: spi_master_put(master); return ret; @@ -790,10 +770,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) static int sh_msiof_spi_remove(struct platform_device *pdev) { - struct sh_msiof_spi_priv *p = platform_get_drvdata(pdev); - pm_runtime_disable(&pdev->dev); - clk_unprepare(p->clk); return 0; } -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert@linux-m68k.org> To: Mark Brown <broonie@kernel.org> Cc: linux-spi@vger.kernel.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert+renesas@linux-m68k.org>, Magnus Damm <magnus.damm@gmail.com> Subject: [PATCH 2/3] spi: sh-msiof: Convert to spi core auto_runtime_pm framework Date: Tue, 11 Mar 2014 10:59:11 +0100 [thread overview] Message-ID: <1394531952-3905-2-git-send-email-geert@linux-m68k.org> (raw) In-Reply-To: <1394531952-3905-1-git-send-email-geert@linux-m68k.org> From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Cc: Magnus Damm <magnus.damm@gmail.com> --- drivers/spi/spi-sh-msiof.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 739eb2f12ecc..e850d03e7190 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -448,9 +448,6 @@ static int sh_msiof_prepare_message(struct spi_master *master, struct sh_msiof_spi_priv *p = spi_master_get_devdata(master); const struct spi_device *spi = msg->spi; - pm_runtime_get_sync(&p->pdev->dev); - clk_enable(p->clk); - /* Configure pins before asserting CS */ sh_msiof_spi_set_pin_regs(p, !!(spi->mode & SPI_CPOL), !!(spi->mode & SPI_CPHA), @@ -460,16 +457,6 @@ static int sh_msiof_prepare_message(struct spi_master *master, return 0; } -static int sh_msiof_unprepare_message(struct spi_master *master, - struct spi_message *msg) -{ - struct sh_msiof_spi_priv *p = spi_master_get_devdata(master); - - clk_disable(p->clk); - pm_runtime_put(&p->pdev->dev); - return 0; -} - static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p, void (*tx_fifo)(struct sh_msiof_spi_priv *, const void *, int, int), @@ -742,12 +729,6 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) goto err1; } - ret = clk_prepare(p->clk); - if (ret < 0) { - dev_err(&pdev->dev, "unable to prepare clock\n"); - goto err1; - } - p->pdev = pdev; pm_runtime_enable(&pdev->dev); @@ -768,8 +749,8 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) master->num_chipselect = p->info->num_chipselect; master->setup = sh_msiof_spi_setup; master->prepare_message = sh_msiof_prepare_message; - master->unprepare_message = sh_msiof_unprepare_message; master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32); + master->auto_runtime_pm = true; master->transfer_one = sh_msiof_transfer_one; ret = devm_spi_register_master(&pdev->dev, master); @@ -782,7 +763,6 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) err2: pm_runtime_disable(&pdev->dev); - clk_unprepare(p->clk); err1: spi_master_put(master); return ret; @@ -790,10 +770,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) static int sh_msiof_spi_remove(struct platform_device *pdev) { - struct sh_msiof_spi_priv *p = platform_get_drvdata(pdev); - pm_runtime_disable(&pdev->dev); - clk_unprepare(p->clk); return 0; } -- 1.7.9.5
next prev parent reply other threads:[~2014-03-11 9:59 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-03-11 9:59 [PATCH 1/3] spi: sh-hspi: Add missing call to pm_runtime_disable() in failure path Geert Uytterhoeven 2014-03-11 9:59 ` Geert Uytterhoeven 2014-03-11 9:59 ` Geert Uytterhoeven [this message] 2014-03-11 9:59 ` [PATCH 2/3] spi: sh-msiof: Convert to spi core auto_runtime_pm framework Geert Uytterhoeven [not found] ` <1394531952-3905-2-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> 2014-03-11 10:45 ` Mark Brown 2014-03-11 10:45 ` Mark Brown 2014-03-11 10:45 ` Mark Brown 2014-03-11 15:55 ` Laurent Pinchart 2014-03-11 15:55 ` Laurent Pinchart 2014-03-11 15:55 ` Laurent Pinchart 2014-03-11 16:23 ` Geert Uytterhoeven 2014-03-11 16:23 ` Geert Uytterhoeven 2014-03-11 16:23 ` Geert Uytterhoeven 2014-03-11 16:32 ` Laurent Pinchart 2014-03-11 16:32 ` Laurent Pinchart 2014-03-11 17:44 ` Geert Uytterhoeven 2014-03-11 17:44 ` Geert Uytterhoeven [not found] ` <CAMuHMdXEOygh0--niiLcXFgnRNPi_b0EGPKVBg2Q6Ws01YmNjw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2014-03-11 17:57 ` Laurent Pinchart 2014-03-11 17:57 ` Laurent Pinchart 2014-03-11 17:57 ` Laurent Pinchart 2014-03-12 1:23 ` Magnus Damm 2014-03-12 1:23 ` Magnus Damm 2014-03-12 1:23 ` Magnus Damm [not found] ` <CANqRtoRR9Q8Q=ACqhnLBpTavn0K5cD1=dBkjkfZ8kb+H68GuOw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2014-03-12 11:26 ` Laurent Pinchart 2014-03-12 11:26 ` Laurent Pinchart 2014-03-12 11:26 ` Laurent Pinchart 2014-03-12 11:28 ` Magnus Damm 2014-03-12 11:28 ` Magnus Damm 2014-03-12 11:28 ` Magnus Damm [not found] ` <1394531952-3905-1-git-send-email-geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org> 2014-03-11 9:59 ` [PATCH 3/3] spi: rspi: Add runtime PM support, using spi core auto_runtime_pm Geert Uytterhoeven 2014-03-11 9:59 ` Geert Uytterhoeven 2014-03-11 9:59 ` Geert Uytterhoeven 2014-03-11 10:47 ` Mark Brown 2014-03-11 13:10 ` Geert Uytterhoeven 2014-03-11 13:10 ` Geert Uytterhoeven 2014-03-11 13:26 ` Mark Brown 2014-03-11 13:35 ` Geert Uytterhoeven 2014-03-11 13:35 ` Geert Uytterhoeven 2014-03-11 14:18 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1394531952-3905-2-git-send-email-geert@linux-m68k.org \ --to=geert@linux-m68k.org \ --cc=broonie@kernel.org \ --cc=geert+renesas@linux-m68k.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=magnus.damm@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.