diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2007-07-31 09:38:41 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-01 00:39:39 +0200 |
| commit | 20ba09b979f7e1de790968a9175c6caceda00261 (patch) | |
| tree | 1fbc7a8892a7385a37f858af592fb84fa134017e /drivers/spi | |
| parent | spi_mpc83xx: turn off SPI unit while switching mode (diff) | |
| download | linux-20ba09b979f7e1de790968a9175c6caceda00261.tar.xz linux-20ba09b979f7e1de790968a9175c6caceda00261.zip | |
spi_mpc83xx: get rid of magic numbers
Magic-numbers-R-Evil
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi_mpc83xx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c index 0b99fd9f5171..e2d8dbc15c80 100644 --- a/drivers/spi/spi_mpc83xx.c +++ b/drivers/spi/spi_mpc83xx.c @@ -153,7 +153,8 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value) len = len - 1; /* mask out bits we are going to set */ - regval &= ~0x38ff0000; + regval &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH | + SPMODE_LEN(0xF) | SPMODE_DIV16 | SPMODE_PM(0xF)); if (spi->mode & SPI_CPHA) regval |= SPMODE_CP_BEGIN_EDGECLK; @@ -248,7 +249,7 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) regval = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode); /* Mask out bits_per_wordgth */ - regval &= 0xff0fffff; + regval &= ~SPMODE_LEN(0xF); regval |= SPMODE_LEN(bits_per_word); /* Turn off SPI unit prior changing mode */ |