aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-pxa2xx.h
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2018-02-01 17:17:30 +0200
committerMark Brown <broonie@kernel.org>2018-02-12 12:04:24 +0000
commit3cc7b0e35745ae4e153f174038df34a79a385b32 (patch)
treeb7ede3d1b917adca6568b7969ba12e8072c77e4f /drivers/spi/spi-pxa2xx.h
parentspi: pxa2xx: Move SSP idle waiting to cs_deassert() (diff)
downloadlinux-dev-3cc7b0e35745ae4e153f174038df34a79a385b32.tar.xz
linux-dev-3cc7b0e35745ae4e153f174038df34a79a385b32.zip
spi: pxa2xx: Convert to generalized SPI controller API
Convert to generalized SPI controller API introduced by the commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller""). Inside driver variable name "master" is still used to indicate the driver is master only. While at it, change "unsigned cs" to "unsigned int cs" in pxa2xx_spi_fw_translate_cs() to suppress checkpatch warning. Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-pxa2xx.h')
-rw-r--r--drivers/spi/spi-pxa2xx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-pxa2xx.h b/drivers/spi/spi-pxa2xx.h
index 94f7b0713281..513ec6c6e25b 100644
--- a/drivers/spi/spi-pxa2xx.h
+++ b/drivers/spi/spi-pxa2xx.h
@@ -31,7 +31,7 @@ struct driver_data {
/* SPI framework hookup */
enum pxa_ssp_type ssp_type;
- struct spi_master *master;
+ struct spi_controller *master;
/* PXA hookup */
struct pxa2xx_spi_master *master_info;