LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: linux-kernel@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
	kernel-janitors@vger.kernel.org,
	Wolfram Sang <wsa+renesas@sang-engineering.com>,
	Ludovic Desroches <ludovic.desroches@microchip.com>,
	Vinod Koul <vinod.koul@intel.com>,
	Dan Williams <dan.j.williams@intel.com>,
	Li Yang <leoyang.li@nxp.com>, Zhang Wei <zw@zh-kernel.org>,
	Linus Walleij <linus.walleij@linaro.org>,
	linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org,
	linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 07/61] dma: simplify getting .drvdata
Date: Thu, 19 Apr 2018 16:05:37 +0200	[thread overview]
Message-ID: <20180419140641.27926-8-wsa+renesas@sang-engineering.com> (raw)
In-Reply-To: <20180419140641.27926-1-wsa+renesas@sang-engineering.com>

We should get drvdata from struct device directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Build tested only. buildbot is happy. Please apply individually.

 drivers/dma/at_hdmac.c  |  9 +++------
 drivers/dma/at_xdmac.c  |  9 +++------
 drivers/dma/fsldma.c    |  6 ++----
 drivers/dma/idma64.c    |  6 ++----
 drivers/dma/ste_dma40.c | 12 ++++--------
 drivers/dma/txx9dmac.c  |  8 +++-----
 6 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index a861b5b4d443..75f38d19fcbe 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -2041,8 +2041,7 @@ static void at_dma_shutdown(struct platform_device *pdev)
 
 static int at_dma_prepare(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct at_dma *atdma = platform_get_drvdata(pdev);
+	struct at_dma *atdma = dev_get_drvdata(dev);
 	struct dma_chan *chan, *_chan;
 
 	list_for_each_entry_safe(chan, _chan, &atdma->dma_common.channels,
@@ -2076,8 +2075,7 @@ static void atc_suspend_cyclic(struct at_dma_chan *atchan)
 
 static int at_dma_suspend_noirq(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct at_dma *atdma = platform_get_drvdata(pdev);
+	struct at_dma *atdma = dev_get_drvdata(dev);
 	struct dma_chan *chan, *_chan;
 
 	/* preserve data */
@@ -2118,8 +2116,7 @@ static void atc_resume_cyclic(struct at_dma_chan *atchan)
 
 static int at_dma_resume_noirq(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct at_dma *atdma = platform_get_drvdata(pdev);
+	struct at_dma *atdma = dev_get_drvdata(dev);
 	struct dma_chan *chan, *_chan;
 
 	/* bring back DMA controller */
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
index 94236ec9d410..4bf72561667c 100644
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@ -1833,8 +1833,7 @@ static void at_xdmac_free_chan_resources(struct dma_chan *chan)
 #ifdef CONFIG_PM
 static int atmel_xdmac_prepare(struct device *dev)
 {
-	struct platform_device	*pdev = to_platform_device(dev);
-	struct at_xdmac		*atxdmac = platform_get_drvdata(pdev);
+	struct at_xdmac		*atxdmac = dev_get_drvdata(dev);
 	struct dma_chan		*chan, *_chan;
 
 	list_for_each_entry_safe(chan, _chan, &atxdmac->dma.channels, device_node) {
@@ -1853,8 +1852,7 @@ static int atmel_xdmac_prepare(struct device *dev)
 #ifdef CONFIG_PM_SLEEP
 static int atmel_xdmac_suspend(struct device *dev)
 {
-	struct platform_device	*pdev = to_platform_device(dev);
-	struct at_xdmac		*atxdmac = platform_get_drvdata(pdev);
+	struct at_xdmac		*atxdmac = dev_get_drvdata(dev);
 	struct dma_chan		*chan, *_chan;
 
 	list_for_each_entry_safe(chan, _chan, &atxdmac->dma.channels, device_node) {
@@ -1878,8 +1876,7 @@ static int atmel_xdmac_suspend(struct device *dev)
 
 static int atmel_xdmac_resume(struct device *dev)
 {
-	struct platform_device	*pdev = to_platform_device(dev);
-	struct at_xdmac		*atxdmac = platform_get_drvdata(pdev);
+	struct at_xdmac		*atxdmac = dev_get_drvdata(dev);
 	struct at_xdmac_chan	*atchan;
 	struct dma_chan		*chan, *_chan;
 	int			i;
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 3eaece888e75..1117b5123a6f 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -1328,8 +1328,7 @@ static int fsldma_of_remove(struct platform_device *op)
 #ifdef CONFIG_PM
 static int fsldma_suspend_late(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct fsldma_device *fdev = platform_get_drvdata(pdev);
+	struct fsldma_device *fdev = dev_get_drvdata(dev);
 	struct fsldma_chan *chan;
 	int i;
 
@@ -1360,8 +1359,7 @@ static int fsldma_suspend_late(struct device *dev)
 
 static int fsldma_resume_early(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct fsldma_device *fdev = platform_get_drvdata(pdev);
+	struct fsldma_device *fdev = dev_get_drvdata(dev);
 	struct fsldma_chan *chan;
 	u32 mode;
 	int i;
diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c
index 1953e57505f4..e5c911200bdb 100644
--- a/drivers/dma/idma64.c
+++ b/drivers/dma/idma64.c
@@ -670,8 +670,7 @@ static int idma64_platform_remove(struct platform_device *pdev)
 
 static int idma64_pm_suspend(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct idma64_chip *chip = platform_get_drvdata(pdev);
+	struct idma64_chip *chip = dev_get_drvdata(dev);
 
 	idma64_off(chip->idma64);
 	return 0;
@@ -679,8 +678,7 @@ static int idma64_pm_suspend(struct device *dev)
 
 static int idma64_pm_resume(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct idma64_chip *chip = platform_get_drvdata(pdev);
+	struct idma64_chip *chip = dev_get_drvdata(dev);
 
 	idma64_on(chip->idma64);
 	return 0;
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index c2b089af0420..1bc149af990e 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2889,8 +2889,7 @@ static int __init d40_dmaengine_init(struct d40_base *base,
 #ifdef CONFIG_PM_SLEEP
 static int dma40_suspend(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct d40_base *base = platform_get_drvdata(pdev);
+	struct d40_base *base = dev_get_drvdata(dev);
 	int ret;
 
 	ret = pm_runtime_force_suspend(dev);
@@ -2904,8 +2903,7 @@ static int dma40_suspend(struct device *dev)
 
 static int dma40_resume(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct d40_base *base = platform_get_drvdata(pdev);
+	struct d40_base *base = dev_get_drvdata(dev);
 	int ret = 0;
 
 	if (base->lcpa_regulator) {
@@ -2970,8 +2968,7 @@ static void d40_save_restore_registers(struct d40_base *base, bool save)
 
 static int dma40_runtime_suspend(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct d40_base *base = platform_get_drvdata(pdev);
+	struct d40_base *base = dev_get_drvdata(dev);
 
 	d40_save_restore_registers(base, true);
 
@@ -2985,8 +2982,7 @@ static int dma40_runtime_suspend(struct device *dev)
 
 static int dma40_runtime_resume(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct d40_base *base = platform_get_drvdata(pdev);
+	struct d40_base *base = dev_get_drvdata(dev);
 
 	d40_save_restore_registers(base, false);
 
diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c
index 4d8c7b9078fd..eb45af71d3a3 100644
--- a/drivers/dma/txx9dmac.c
+++ b/drivers/dma/txx9dmac.c
@@ -1244,8 +1244,7 @@ static void txx9dmac_shutdown(struct platform_device *pdev)
 
 static int txx9dmac_suspend_noirq(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct txx9dmac_dev *ddev = platform_get_drvdata(pdev);
+	struct txx9dmac_dev *ddev = dev_get_drvdata(dev);
 
 	txx9dmac_off(ddev);
 	return 0;
@@ -1253,9 +1252,8 @@ static int txx9dmac_suspend_noirq(struct device *dev)
 
 static int txx9dmac_resume_noirq(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct txx9dmac_dev *ddev = platform_get_drvdata(pdev);
-	struct txx9dmac_platform_data *pdata = dev_get_platdata(&pdev->dev);
+	struct txx9dmac_dev *ddev = dev_get_drvdata(dev);
+	struct txx9dmac_platform_data *pdata = dev_get_platdata(dev);
 	u32 mcr;
 
 	mcr = TXX9_DMA_MCR_MSTEN | MCR_LE;
-- 
2.11.0

  parent reply	other threads:[~2018-04-19 14:26 UTC|newest]

Thread overview: 137+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-19 14:05 [greybus-dev] [PATCH 00/61] tree-wide: " Wolfram Sang
2018-04-19 14:05 ` [PATCH 01/61] ARM: plat-samsung: " Wolfram Sang
2018-04-21 17:05   ` Krzysztof Kozlowski
2018-04-19 14:05 ` [PATCH 02/61] ata: " Wolfram Sang
2018-04-19 16:22   ` Sergei Shtylyov
2018-04-19 14:05 ` [PATCH 03/61] auxdisplay: " Wolfram Sang
2018-04-19 14:34   ` Miguel Ojeda
2018-04-27 13:30   ` Linus Walleij
2018-04-19 14:05 ` [PATCH 04/61] bus: " Wolfram Sang
2018-04-26 23:29   ` Florian Fainelli
2018-04-19 14:05 ` [PATCH 05/61] clk: samsung: " Wolfram Sang
2018-04-24  7:30   ` Chanwoo Choi
2018-04-25 12:49   ` Sylwester Nawrocki
     [not found]   ` <CGME20180515093219epcas1p28a5fa4be53b9ea0fd85e4726cf92f804@epcas1p2.samsung.com>
2018-05-15  9:32     ` Sylwester Nawrocki
2018-05-15 21:04       ` Stephen Boyd
2018-05-15 21:05   ` Stephen Boyd
2018-04-19 14:05 ` [PATCH 06/61] crypto: " Wolfram Sang
2018-04-20  6:07   ` Krzysztof Kozlowski
2018-04-28  8:24   ` Herbert Xu
2018-04-19 14:05 ` Wolfram Sang [this message]
2018-04-22  6:17   ` [PATCH 07/61] dma: " Vinod Koul
2018-04-22  9:14     ` Wolfram Sang
2018-04-19 14:05 ` [PATCH 08/61] dmaengine: dw: " Wolfram Sang
2018-04-20  4:21   ` Viresh Kumar
2018-04-22  6:22   ` Vinod Koul
2018-04-19 14:05 ` [PATCH 09/61] dmaengine: qcom: " Wolfram Sang
2018-04-19 15:16   ` Sinan Kaya
2018-04-22  6:21   ` Vinod Koul
2018-04-19 14:05 ` [PATCH 10/61] gpio: " Wolfram Sang
2018-04-19 15:14   ` Grygorii Strashko
2018-04-30  9:03     ` Linus Walleij
2018-04-30  9:12       ` Wolfram Sang
2018-04-30  9:29       ` Thierry Reding
2019-03-07 20:13         ` Adam Ford
2019-03-07 20:18           ` Wolfram Sang
2019-03-07 20:53             ` Enrico Weigelt, metux IT consult
2019-03-07 20:58               ` Wolfram Sang
2019-03-19 14:31                 ` Wolfram Sang
2018-04-20  7:20   ` Michal Simek
2018-04-21 16:23     ` Wolfram Sang
2018-04-23  6:04       ` Michal Simek
2018-04-19 14:05 ` [PATCH 11/61] gpu: drm: msm: " Wolfram Sang
2018-04-19 14:05 ` [PATCH 12/61] gpu: drm: msm: adreno: " Wolfram Sang
2018-04-19 14:05 ` [PATCH 13/61] gpu: drm: msm: disp: mdp5: " Wolfram Sang
2018-04-19 14:05 ` [PATCH 14/61] gpu: drm: msm: dsi: " Wolfram Sang
2018-04-19 14:05 ` [PATCH 15/61] gpu: drm: omapdrm: displays: " Wolfram Sang
2018-05-23  9:32   ` Tomi Valkeinen
2018-04-19 14:05 ` [PATCH 16/61] gpu: drm: vc4: " Wolfram Sang
2018-04-23 18:26   ` Eric Anholt
2018-04-19 14:05 ` [PATCH 17/61] hid: " Wolfram Sang
2018-04-19 14:05 ` [PATCH 18/61] iio: common: cros_ec_sensors: " Wolfram Sang
2018-04-21 16:07   ` Jonathan Cameron
2018-04-19 14:05 ` [PATCH 19/61] iio: common: hid-sensors: " Wolfram Sang
2018-04-21 16:09   ` Jonathan Cameron
2018-04-19 14:05 ` [PATCH 20/61] input: keyboard: " Wolfram Sang
2018-04-26 19:19   ` Dmitry Torokhov
2018-04-26 20:04     ` Wolfram Sang
2018-04-26 21:23       ` Dmitry Torokhov
2018-04-27 10:20         ` Wolfram Sang
2018-04-19 14:05 ` [PATCH 21/61] input: misc: " Wolfram Sang
2018-04-19 14:05 ` [PATCH 22/61] input: mouse: " Wolfram Sang
2018-04-19 14:05 ` [PATCH 23/61] input: touchscreen: " Wolfram Sang
2018-04-19 14:05 ` [PATCH 24/61] iommu: " Wolfram Sang
2018-05-03 13:19   ` Joerg Roedel
2018-04-19 14:05 ` [PATCH 25/61] media: platform: am437x: " Wolfram Sang
2018-04-19 14:05 ` [PATCH 26/61] media: platform: exynos4-is: " Wolfram Sang
     [not found]   ` <CGME20180515094754epcas2p2715cc9c6376ddbb5f400830ef41b514b@epcas2p2.samsung.com>
2018-05-15  9:47     ` Sylwester Nawrocki
2018-04-19 14:05 ` [PATCH 27/61] media: platform: s5p-mfc: " Wolfram Sang
     [not found]   ` <CGME20180515094647epcas1p49b3c5d47dcedd034aec9589aab473cc0@epcas1p4.samsung.com>
2018-05-15  9:46     ` Sylwester Nawrocki
2018-04-19 14:05 ` [PATCH 28/61] mmc: host: " Wolfram Sang
2018-04-20  7:10   ` Ulf Hansson
2018-04-19 14:05 ` [PATCH 29/61] mtd: devices: " Wolfram Sang
2018-04-21 19:35   ` Robert Jarzmik
2018-04-22 17:13   ` Boris Brezillon
2018-04-19 14:06 ` [PATCH 30/61] mtd: nand: onenand: " Wolfram Sang
2018-04-22 17:29   ` Boris Brezillon
2018-04-19 14:06 ` [PATCH 31/61] net: dsa: " Wolfram Sang
2018-04-27  0:22   ` Florian Fainelli
2018-04-19 14:06 ` [PATCH 32/61] net: ethernet: cadence: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 33/61] net: ethernet: davicom: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 34/61] net: ethernet: smsc: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 35/61] net: ethernet: ti: " Wolfram Sang
2018-04-19 15:14   ` Grygorii Strashko
2018-04-19 14:06 ` [PATCH 36/61] net: ethernet: wiznet: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 37/61] perf: " Wolfram Sang
2018-04-24 16:08   ` Will Deacon
2018-04-19 14:06 ` [PATCH 38/61] pinctrl: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 39/61] pinctrl: intel: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 40/61] platform: x86: " Wolfram Sang
2018-04-19 23:56   ` Darren Hart
2018-04-20  7:14     ` Wolfram Sang
2018-04-19 14:06 ` [PATCH 41/61] power: supply: " Wolfram Sang
2018-04-25 21:16   ` Sebastian Reichel
2018-04-19 14:06 ` [PATCH 42/61] ptp: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 43/61] pwm: " Wolfram Sang
2018-04-20  8:17   ` Nicolas Ferre
2018-04-30  9:28   ` Thierry Reding
2018-04-19 14:06 ` [PATCH 44/61] rtc: " Wolfram Sang
2018-04-20  7:24   ` Michal Simek
2018-05-03 20:09   ` Alexandre Belloni
2018-04-19 14:06 ` [PATCH 45/61] slimbus: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 46/61] spi: " Wolfram Sang
2018-04-20  7:24   ` Michal Simek
2018-04-20 17:05   ` Applied "spi: simplify getting .drvdata" to the spi tree Mark Brown
2018-04-19 14:06 ` [PATCH 47/61] staging: greybus: simplify getting .drvdata Wolfram Sang
2018-04-20  4:24   ` [greybus-dev] " Viresh Kumar
2018-04-20  7:23   ` Johan Hovold
2018-04-19 14:06 ` [PATCH 48/61] staging: iio: adc: " Wolfram Sang
2018-04-21 16:10   ` Jonathan Cameron
2018-04-19 14:06 ` [PATCH 49/61] staging: nvec: " Wolfram Sang
2018-04-20  8:45   ` Marc Dietrich
2018-04-19 14:06 ` [PATCH 50/61] thermal: " Wolfram Sang
2018-05-02  8:52   ` Shawn Guo
2018-05-03 12:23   ` Heiko Stuebner
2018-04-19 14:06 ` [PATCH 51/61] thermal: int340x_thermal: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 52/61] thermal: st: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 53/61] tty: serial: " Wolfram Sang
2018-04-19 16:23   ` Uwe Kleine-König
2018-04-20  7:23   ` Michal Simek
2018-04-20  8:46   ` Patrice CHOTARD
2018-04-19 14:06 ` [PATCH 54/61] uio: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 55/61] usb: mtu3: " Wolfram Sang
2018-04-20  7:46   ` Chunfeng Yun
2018-04-19 14:06 ` [PATCH 56/61] usb: phy: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 57/61] video: fbdev: " Wolfram Sang
2018-04-24 15:59   ` Bartlomiej Zolnierkiewicz
2018-04-19 14:06 ` [PATCH 58/61] video: fbdev: omap2: omapfb: displays: " Wolfram Sang
2018-04-24 16:02   ` Bartlomiej Zolnierkiewicz
2018-04-19 14:06 ` [PATCH 59/61] watchdog: " Wolfram Sang
2018-04-19 20:06   ` Guenter Roeck
2018-04-20  7:23   ` Michal Simek
2018-04-19 14:06 ` [PATCH 60/61] net: dsa: " Wolfram Sang
2018-04-19 14:06 ` [PATCH 61/61] ASoC: atmel: " Wolfram Sang
2018-04-20  8:06   ` Nicolas Ferre
2018-04-20 17:04   ` Applied "ASoC: atmel: simplify getting .drvdata" to the asoc tree Mark Brown
2018-04-19 22:23 ` [PATCH 00/61] tree-wide: simplify getting .drvdata Stephen Boyd
2018-04-20  7:15   ` Wolfram Sang

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=20180419140641.27926-8-wsa+renesas@sang-engineering.com \
    --to=wsa+renesas@sang-engineering.com \
    --cc=dan.j.williams@intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=leoyang.li@nxp.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=ludovic.desroches@microchip.com \
    --cc=vinod.koul@intel.com \
    --cc=zw@zh-kernel.org \
    --subject='Re: [PATCH 07/61] dma: simplify getting .drvdata' \
    /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: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).