The patch titled spi_mpc83xx: get rid of magic numbers has been added to the -mm tree. Its filename is spi_mpc83xx-get-rid-of-magic-numbers.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: spi_mpc83xx: get rid of magic numbers From: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx> Magic-numbers-R-Evil Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx> Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx> Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/spi/spi_mpc83xx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN drivers/spi/spi_mpc83xx.c~spi_mpc83xx-get-rid-of-magic-numbers drivers/spi/spi_mpc83xx.c --- a/drivers/spi/spi_mpc83xx.c~spi_mpc83xx-get-rid-of-magic-numbers +++ a/drivers/spi/spi_mpc83xx.c @@ -153,7 +153,8 @@ static void mpc83xx_spi_chipselect(struc 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 sp 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 */ _ Patches currently in -mm which might be from avorontsov@xxxxxxxxxxxxx are spi_mpc83xx-turn-off-spi-unit-while-switching-mode.patch spi_mpc83xx-get-rid-of-magic-numbers.patch spi_mpc83xx-support-for-lsb-first-transfers.patch spi_mpc83xx-fix-qelsb-mode-shifts.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html