Commit 4f3d9577 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown

spi: pxa2xx: No need to keep pointer to platform device

There is no need to keep a pointer to the platform device. Currently there are
no users of it directly, and if there will be in the future we may restore it
from pointer to the struct device.

Convert all users at the same time.

Cc: Russell King <linux@armlinux.org.uk>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20191018105429.82782-1-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent e74dc5c7
...@@ -89,7 +89,7 @@ void pxa_ssp_free(struct ssp_device *ssp) ...@@ -89,7 +89,7 @@ void pxa_ssp_free(struct ssp_device *ssp)
ssp->use_count--; ssp->use_count--;
ssp->label = NULL; ssp->label = NULL;
} else } else
dev_err(&ssp->pdev->dev, "device already free\n"); dev_err(ssp->dev, "device already free\n");
mutex_unlock(&ssp_lock); mutex_unlock(&ssp_lock);
} }
EXPORT_SYMBOL(pxa_ssp_free); EXPORT_SYMBOL(pxa_ssp_free);
...@@ -118,7 +118,7 @@ static int pxa_ssp_probe(struct platform_device *pdev) ...@@ -118,7 +118,7 @@ static int pxa_ssp_probe(struct platform_device *pdev)
if (ssp == NULL) if (ssp == NULL)
return -ENOMEM; return -ENOMEM;
ssp->pdev = pdev; ssp->dev = dev;
ssp->clk = devm_clk_get(dev, NULL); ssp->clk = devm_clk_get(dev, NULL);
if (IS_ERR(ssp->clk)) if (IS_ERR(ssp->clk))
......
...@@ -1567,7 +1567,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) ...@@ -1567,7 +1567,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)
ssp->clk = devm_clk_get(&pdev->dev, NULL); ssp->clk = devm_clk_get(&pdev->dev, NULL);
ssp->irq = platform_get_irq(pdev, 0); ssp->irq = platform_get_irq(pdev, 0);
ssp->type = type; ssp->type = type;
ssp->pdev = pdev; ssp->dev = &pdev->dev;
ssp->port_id = pxa2xx_spi_get_port_id(adev); ssp->port_id = pxa2xx_spi_get_port_id(adev);
pdata->is_slave = of_property_read_bool(pdev->dev.of_node, "spi-slave"); pdata->is_slave = of_property_read_bool(pdev->dev.of_node, "spi-slave");
......
...@@ -206,7 +206,7 @@ enum pxa_ssp_type { ...@@ -206,7 +206,7 @@ enum pxa_ssp_type {
}; };
struct ssp_device { struct ssp_device {
struct platform_device *pdev; struct device *dev;
struct list_head node; struct list_head node;
struct clk *clk; struct clk *clk;
......
...@@ -177,7 +177,7 @@ static int mmp_sspa_set_dai_fmt(struct snd_soc_dai *cpu_dai, ...@@ -177,7 +177,7 @@ static int mmp_sspa_set_dai_fmt(struct snd_soc_dai *cpu_dai,
/* we can only change the settings if the port is not in use */ /* we can only change the settings if the port is not in use */
if ((mmp_sspa_read_reg(sspa, SSPA_TXSP) & SSPA_SP_S_EN) || if ((mmp_sspa_read_reg(sspa, SSPA_TXSP) & SSPA_SP_S_EN) ||
(mmp_sspa_read_reg(sspa, SSPA_RXSP) & SSPA_SP_S_EN)) { (mmp_sspa_read_reg(sspa, SSPA_RXSP) & SSPA_SP_S_EN)) {
dev_err(&sspa->pdev->dev, dev_err(sspa->dev,
"can't change hardware dai format: stream is in use\n"); "can't change hardware dai format: stream is in use\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -52,11 +52,11 @@ struct ssp_priv { ...@@ -52,11 +52,11 @@ struct ssp_priv {
static void dump_registers(struct ssp_device *ssp) static void dump_registers(struct ssp_device *ssp)
{ {
dev_dbg(&ssp->pdev->dev, "SSCR0 0x%08x SSCR1 0x%08x SSTO 0x%08x\n", dev_dbg(ssp->dev, "SSCR0 0x%08x SSCR1 0x%08x SSTO 0x%08x\n",
pxa_ssp_read_reg(ssp, SSCR0), pxa_ssp_read_reg(ssp, SSCR1), pxa_ssp_read_reg(ssp, SSCR0), pxa_ssp_read_reg(ssp, SSCR1),
pxa_ssp_read_reg(ssp, SSTO)); pxa_ssp_read_reg(ssp, SSTO));
dev_dbg(&ssp->pdev->dev, "SSPSP 0x%08x SSSR 0x%08x SSACD 0x%08x\n", dev_dbg(ssp->dev, "SSPSP 0x%08x SSSR 0x%08x SSACD 0x%08x\n",
pxa_ssp_read_reg(ssp, SSPSP), pxa_ssp_read_reg(ssp, SSSR), pxa_ssp_read_reg(ssp, SSPSP), pxa_ssp_read_reg(ssp, SSSR),
pxa_ssp_read_reg(ssp, SSACD)); pxa_ssp_read_reg(ssp, SSACD));
} }
...@@ -223,7 +223,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, ...@@ -223,7 +223,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
clk_id = PXA_SSP_CLK_EXT; clk_id = PXA_SSP_CLK_EXT;
} }
dev_dbg(&ssp->pdev->dev, dev_dbg(ssp->dev,
"pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %u\n", "pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %u\n",
cpu_dai->id, clk_id, freq); cpu_dai->id, clk_id, freq);
...@@ -316,7 +316,7 @@ static int pxa_ssp_set_pll(struct ssp_priv *priv, unsigned int freq) ...@@ -316,7 +316,7 @@ static int pxa_ssp_set_pll(struct ssp_priv *priv, unsigned int freq)
ssacd |= (0x6 << 4); ssacd |= (0x6 << 4);
dev_dbg(&ssp->pdev->dev, dev_dbg(ssp->dev,
"Using SSACDD %x to supply %uHz\n", "Using SSACDD %x to supply %uHz\n",
val, freq); val, freq);
break; break;
...@@ -687,7 +687,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, ...@@ -687,7 +687,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
* - complain loudly and fail if they've not been set up yet. * - complain loudly and fail if they've not been set up yet.
*/ */
if ((sscr0 & SSCR0_MOD) && !ttsa) { if ((sscr0 & SSCR0_MOD) && !ttsa) {
dev_err(&ssp->pdev->dev, "No TDM timeslot configured\n"); dev_err(ssp->dev, "No TDM timeslot configured\n");
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment