summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-11-22 19:56:35 +0000
committerMark Brown <broonie@kernel.org>2019-11-22 19:56:35 +0000
commitca4196aa10087fe3ba3ce2383761898dc95b5e94 (patch)
treef870402f36377f3bde4b939da23dda18bc9bc862 /arch/arm
parent8f3ed6d0b0db04db8297d951c26c809dd7b4778d (diff)
parentffa119f7c42d29be2dd759bb18cc4d1f45804c6b (diff)
downloadlinux-ca4196aa10087fe3ba3ce2383761898dc95b5e94.tar.bz2
Merge branch 'spi-5.5' into spi-next
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-pxa/ssp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-pxa/ssp.c b/arch/arm/plat-pxa/ssp.c
index 9a6e4923bd69..563440315acd 100644
--- a/arch/arm/plat-pxa/ssp.c
+++ b/arch/arm/plat-pxa/ssp.c
@@ -89,7 +89,7 @@ void pxa_ssp_free(struct ssp_device *ssp)
ssp->use_count--;
ssp->label = NULL;
} else
- dev_err(&ssp->pdev->dev, "device already free\n");
+ dev_err(ssp->dev, "device already free\n");
mutex_unlock(&ssp_lock);
}
EXPORT_SYMBOL(pxa_ssp_free);
@@ -118,7 +118,7 @@ static int pxa_ssp_probe(struct platform_device *pdev)
if (ssp == NULL)
return -ENOMEM;
- ssp->pdev = pdev;
+ ssp->dev = dev;
ssp->clk = devm_clk_get(dev, NULL);
if (IS_ERR(ssp->clk))