| From 8861d398bc7bfedbfbd6b9f8b07096731b262f18 Mon Sep 17 00:00:00 2001 |
| From: Jingoo Han <jg1.han@samsung.com> |
| Date: Thu, 23 May 2013 19:20:40 +0900 |
| Subject: spi: use platform_{get,set}_drvdata() |
| |
| Use the wrapper functions for getting and setting the driver data using |
| platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, |
| so we can directly pass a struct platform_device. |
| |
| Signed-off-by: Jingoo Han <jg1.han@samsung.com> |
| Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| (cherry picked from commit 24b5a82cf5709a4bc577f42fdaa61b23a7f58f08) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/spi/spi-davinci.c | 4 ++-- |
| drivers/spi/spi-fsl-spi.c | 2 +- |
| drivers/spi/spi-mpc52xx-psc.c | 2 +- |
| drivers/spi/spi-mpc52xx.c | 4 ++-- |
| drivers/spi/spi-omap-100k.c | 4 ++-- |
| drivers/spi/spi-omap-uwire.c | 4 ++-- |
| drivers/spi/spi-omap2-mcspi.c | 4 ++-- |
| drivers/spi/spi-orion.c | 4 ++-- |
| drivers/spi/spi-ppc4xx.c | 6 ++---- |
| drivers/spi/spi-sh-hspi.c | 4 ++-- |
| drivers/spi/spi-sh.c | 4 ++-- |
| drivers/spi/spi-tegra114.c | 4 ++-- |
| drivers/spi/spi-tegra20-sflash.c | 4 ++-- |
| drivers/spi/spi-tegra20-slink.c | 4 ++-- |
| 14 files changed, 26 insertions(+), 28 deletions(-) |
| |
| diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c |
| index df0aacc6fc3b..7554974189dd 100644 |
| --- a/drivers/spi/spi-davinci.c |
| +++ b/drivers/spi/spi-davinci.c |
| @@ -865,7 +865,7 @@ static int davinci_spi_probe(struct platform_device *pdev) |
| goto err; |
| } |
| |
| - dev_set_drvdata(&pdev->dev, master); |
| + platform_set_drvdata(pdev, master); |
| |
| dspi = spi_master_get_devdata(master); |
| if (dspi == NULL) { |
| @@ -1044,7 +1044,7 @@ static int davinci_spi_remove(struct platform_device *pdev) |
| struct spi_master *master; |
| struct resource *r; |
| |
| - master = dev_get_drvdata(&pdev->dev); |
| + master = platform_get_drvdata(pdev); |
| dspi = spi_master_get_devdata(master); |
| |
| spi_bitbang_stop(&dspi->bitbang); |
| diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c |
| index 14e202ee7036..41e89c3e3edc 100644 |
| --- a/drivers/spi/spi-fsl-spi.c |
| +++ b/drivers/spi/spi-fsl-spi.c |
| @@ -853,7 +853,7 @@ err: |
| |
| static int of_fsl_spi_remove(struct platform_device *ofdev) |
| { |
| - struct spi_master *master = dev_get_drvdata(&ofdev->dev); |
| + struct spi_master *master = platform_get_drvdata(ofdev); |
| struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(master); |
| int ret; |
| |
| diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c |
| index 291120b37dbb..fed0571d4dec 100644 |
| --- a/drivers/spi/spi-mpc52xx-psc.c |
| +++ b/drivers/spi/spi-mpc52xx-psc.c |
| @@ -481,7 +481,7 @@ static int mpc52xx_psc_spi_of_probe(struct platform_device *op) |
| |
| static int mpc52xx_psc_spi_of_remove(struct platform_device *op) |
| { |
| - struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev)); |
| + struct spi_master *master = spi_master_get(platform_get_drvdata(op)); |
| struct mpc52xx_psc_spi *mps = spi_master_get_devdata(master); |
| |
| flush_workqueue(mps->workqueue); |
| diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c |
| index 29f77056eedc..7c675fe83101 100644 |
| --- a/drivers/spi/spi-mpc52xx.c |
| +++ b/drivers/spi/spi-mpc52xx.c |
| @@ -438,7 +438,7 @@ static int mpc52xx_spi_probe(struct platform_device *op) |
| master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST; |
| master->dev.of_node = op->dev.of_node; |
| |
| - dev_set_drvdata(&op->dev, master); |
| + platform_set_drvdata(op, master); |
| |
| ms = spi_master_get_devdata(master); |
| ms->master = master; |
| @@ -529,7 +529,7 @@ static int mpc52xx_spi_probe(struct platform_device *op) |
| |
| static int mpc52xx_spi_remove(struct platform_device *op) |
| { |
| - struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev)); |
| + struct spi_master *master = spi_master_get(platform_get_drvdata(op)); |
| struct mpc52xx_spi *ms = spi_master_get_devdata(master); |
| int i; |
| |
| diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c |
| index 78d29a18dcc4..9236764861a9 100644 |
| --- a/drivers/spi/spi-omap-100k.c |
| +++ b/drivers/spi/spi-omap-100k.c |
| @@ -510,7 +510,7 @@ static int omap1_spi100k_probe(struct platform_device *pdev) |
| master->num_chipselect = 2; |
| master->mode_bits = MODEBITS; |
| |
| - dev_set_drvdata(&pdev->dev, master); |
| + platform_set_drvdata(pdev, master); |
| |
| spi100k = spi_master_get_devdata(master); |
| spi100k->master = master; |
| @@ -569,7 +569,7 @@ static int omap1_spi100k_remove(struct platform_device *pdev) |
| unsigned long flags; |
| int status = 0; |
| |
| - master = dev_get_drvdata(&pdev->dev); |
| + master = platform_get_drvdata(pdev); |
| spi100k = spi_master_get_devdata(master); |
| |
| spin_lock_irqsave(&spi100k->lock, flags); |
| diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c |
| index 102b233b50c4..a6a8f0961750 100644 |
| --- a/drivers/spi/spi-omap-uwire.c |
| +++ b/drivers/spi/spi-omap-uwire.c |
| @@ -495,7 +495,7 @@ static int uwire_probe(struct platform_device *pdev) |
| return -ENOMEM; |
| } |
| |
| - dev_set_drvdata(&pdev->dev, uwire); |
| + platform_set_drvdata(pdev, uwire); |
| |
| uwire->ck = clk_get(&pdev->dev, "fck"); |
| if (IS_ERR(uwire->ck)) { |
| @@ -538,7 +538,7 @@ static int uwire_probe(struct platform_device *pdev) |
| |
| static int uwire_remove(struct platform_device *pdev) |
| { |
| - struct uwire_spi *uwire = dev_get_drvdata(&pdev->dev); |
| + struct uwire_spi *uwire = platform_get_drvdata(pdev); |
| int status; |
| |
| // FIXME remove all child devices, somewhere ... |
| diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c |
| index 86d2158946bb..1a75aefd1504 100644 |
| --- a/drivers/spi/spi-omap2-mcspi.c |
| +++ b/drivers/spi/spi-omap2-mcspi.c |
| @@ -1204,7 +1204,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev) |
| master->cleanup = omap2_mcspi_cleanup; |
| master->dev.of_node = node; |
| |
| - dev_set_drvdata(&pdev->dev, master); |
| + platform_set_drvdata(pdev, master); |
| |
| mcspi = spi_master_get_devdata(master); |
| mcspi->master = master; |
| @@ -1318,7 +1318,7 @@ static int omap2_mcspi_remove(struct platform_device *pdev) |
| struct omap2_mcspi *mcspi; |
| struct omap2_mcspi_dma *dma_channels; |
| |
| - master = dev_get_drvdata(&pdev->dev); |
| + master = platform_get_drvdata(pdev); |
| mcspi = spi_master_get_devdata(master); |
| dma_channels = mcspi->dma_channels; |
| |
| diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c |
| index 66a5f82cf138..5d90bebaa0fa 100644 |
| --- a/drivers/spi/spi-orion.c |
| +++ b/drivers/spi/spi-orion.c |
| @@ -428,7 +428,7 @@ static int orion_spi_probe(struct platform_device *pdev) |
| master->transfer_one_message = orion_spi_transfer_one_message; |
| master->num_chipselect = ORION_NUM_CHIPSELECTS; |
| |
| - dev_set_drvdata(&pdev->dev, master); |
| + platform_set_drvdata(pdev, master); |
| |
| spi = spi_master_get_devdata(master); |
| spi->master = master; |
| @@ -485,7 +485,7 @@ static int orion_spi_remove(struct platform_device *pdev) |
| struct resource *r; |
| struct orion_spi *spi; |
| |
| - master = dev_get_drvdata(&pdev->dev); |
| + master = platform_get_drvdata(pdev); |
| spi = spi_master_get_devdata(master); |
| |
| clk_disable_unprepare(spi->clk); |
| diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c |
| index 357f183a4fb7..8548e574749d 100644 |
| --- a/drivers/spi/spi-ppc4xx.c |
| +++ b/drivers/spi/spi-ppc4xx.c |
| @@ -406,7 +406,7 @@ static int spi_ppc4xx_of_probe(struct platform_device *op) |
| if (master == NULL) |
| return -ENOMEM; |
| master->dev.of_node = np; |
| - dev_set_drvdata(dev, master); |
| + platform_set_drvdata(op, master); |
| hw = spi_master_get_devdata(master); |
| hw->master = spi_master_get(master); |
| hw->dev = dev; |
| @@ -553,7 +553,6 @@ request_mem_error: |
| free_gpios: |
| free_gpios(hw); |
| free_master: |
| - dev_set_drvdata(dev, NULL); |
| spi_master_put(master); |
| |
| dev_err(dev, "initialization failed\n"); |
| @@ -562,11 +561,10 @@ free_master: |
| |
| static int spi_ppc4xx_of_remove(struct platform_device *op) |
| { |
| - struct spi_master *master = dev_get_drvdata(&op->dev); |
| + struct spi_master *master = platform_get_drvdata(op); |
| struct ppc4xx_spi *hw = spi_master_get_devdata(master); |
| |
| spi_bitbang_stop(&hw->bitbang); |
| - dev_set_drvdata(&op->dev, NULL); |
| release_mem_region(hw->mapbase, hw->mapsize); |
| free_irq(hw->irqnum, hw); |
| iounmap(hw->regs); |
| diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c |
| index eab593eaaafa..716edf999538 100644 |
| --- a/drivers/spi/spi-sh-hspi.c |
| +++ b/drivers/spi/spi-sh-hspi.c |
| @@ -297,7 +297,7 @@ static int hspi_probe(struct platform_device *pdev) |
| } |
| |
| hspi = spi_master_get_devdata(master); |
| - dev_set_drvdata(&pdev->dev, hspi); |
| + platform_set_drvdata(pdev, hspi); |
| |
| /* init hspi */ |
| hspi->master = master; |
| @@ -341,7 +341,7 @@ static int hspi_probe(struct platform_device *pdev) |
| |
| static int hspi_remove(struct platform_device *pdev) |
| { |
| - struct hspi_priv *hspi = dev_get_drvdata(&pdev->dev); |
| + struct hspi_priv *hspi = platform_get_drvdata(pdev); |
| |
| pm_runtime_disable(&pdev->dev); |
| |
| diff --git a/drivers/spi/spi-sh.c b/drivers/spi/spi-sh.c |
| index 3c3600a994bd..c120a70094f2 100644 |
| --- a/drivers/spi/spi-sh.c |
| +++ b/drivers/spi/spi-sh.c |
| @@ -434,7 +434,7 @@ static irqreturn_t spi_sh_irq(int irq, void *_ss) |
| |
| static int spi_sh_remove(struct platform_device *pdev) |
| { |
| - struct spi_sh_data *ss = dev_get_drvdata(&pdev->dev); |
| + struct spi_sh_data *ss = platform_get_drvdata(pdev); |
| |
| spi_unregister_master(ss->master); |
| destroy_workqueue(ss->workqueue); |
| @@ -471,7 +471,7 @@ static int spi_sh_probe(struct platform_device *pdev) |
| } |
| |
| ss = spi_master_get_devdata(master); |
| - dev_set_drvdata(&pdev->dev, ss); |
| + platform_set_drvdata(pdev, ss); |
| |
| switch (res->flags & IORESOURCE_MEM_TYPE_MASK) { |
| case IORESOURCE_MEM_8BIT: |
| diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c |
| index 598eb45e8008..e8f542ab8935 100644 |
| --- a/drivers/spi/spi-tegra114.c |
| +++ b/drivers/spi/spi-tegra114.c |
| @@ -1041,7 +1041,7 @@ static int tegra_spi_probe(struct platform_device *pdev) |
| dev_err(&pdev->dev, "master allocation failed\n"); |
| return -ENOMEM; |
| } |
| - dev_set_drvdata(&pdev->dev, master); |
| + platform_set_drvdata(pdev, master); |
| tspi = spi_master_get_devdata(master); |
| |
| /* Parse DT */ |
| @@ -1152,7 +1152,7 @@ exit_free_master: |
| |
| static int tegra_spi_remove(struct platform_device *pdev) |
| { |
| - struct spi_master *master = dev_get_drvdata(&pdev->dev); |
| + struct spi_master *master = platform_get_drvdata(pdev); |
| struct tegra_spi_data *tspi = spi_master_get_devdata(master); |
| |
| free_irq(tspi->irq, tspi); |
| diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c |
| index 09df8e22dba0..c1d5d95e70ea 100644 |
| --- a/drivers/spi/spi-tegra20-sflash.c |
| +++ b/drivers/spi/spi-tegra20-sflash.c |
| @@ -480,7 +480,7 @@ static int tegra_sflash_probe(struct platform_device *pdev) |
| master->num_chipselect = MAX_CHIP_SELECT; |
| master->bus_num = -1; |
| |
| - dev_set_drvdata(&pdev->dev, master); |
| + platform_set_drvdata(pdev, master); |
| tsd = spi_master_get_devdata(master); |
| tsd->master = master; |
| tsd->dev = &pdev->dev; |
| @@ -555,7 +555,7 @@ exit_free_master: |
| |
| static int tegra_sflash_remove(struct platform_device *pdev) |
| { |
| - struct spi_master *master = dev_get_drvdata(&pdev->dev); |
| + struct spi_master *master = platform_get_drvdata(pdev); |
| struct tegra_sflash_data *tsd = spi_master_get_devdata(master); |
| |
| free_irq(tsd->irq, tsd); |
| diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c |
| index 3faf88d003de..80490cc11ce5 100644 |
| --- a/drivers/spi/spi-tegra20-slink.c |
| +++ b/drivers/spi/spi-tegra20-slink.c |
| @@ -1089,7 +1089,7 @@ static int tegra_slink_probe(struct platform_device *pdev) |
| master->num_chipselect = MAX_CHIP_SELECT; |
| master->bus_num = -1; |
| |
| - dev_set_drvdata(&pdev->dev, master); |
| + platform_set_drvdata(pdev, master); |
| tspi = spi_master_get_devdata(master); |
| tspi->master = master; |
| tspi->dev = &pdev->dev; |
| @@ -1193,7 +1193,7 @@ exit_free_master: |
| |
| static int tegra_slink_remove(struct platform_device *pdev) |
| { |
| - struct spi_master *master = dev_get_drvdata(&pdev->dev); |
| + struct spi_master *master = platform_get_drvdata(pdev); |
| struct tegra_slink_data *tspi = spi_master_get_devdata(master); |
| |
| free_irq(tspi->irq, tspi); |
| -- |
| 1.8.5.rc3 |
| |