The patch titled atmel_spi-clean-up-baud-rate-divisor-calculation-fix has been removed from the -mm tree. Its filename was atmel_spi-clean-up-baud-rate-divisor-calculation-fix.patch This patch was dropped because it was folded into atmel_spi-clean-up-baud-rate-divisor-calculation.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: atmel_spi-clean-up-baud-rate-divisor-calculation-fix From: David Brownell <david-b@xxxxxxxxxxx> Patch should have the appended tweak. Acked-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Cc: Haavard Skinnemoen <haavard.skinnemoen@xxxxxxxxx> Cc: "Janesh Ramakrishnan" <jramakrishnan@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/spi/atmel_spi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/spi/atmel_spi.c~atmel_spi-clean-up-baud-rate-divisor-calculation-fix drivers/spi/atmel_spi.c --- a/drivers/spi/atmel_spi.c~atmel_spi-clean-up-baud-rate-divisor-calculation-fix +++ a/drivers/spi/atmel_spi.c @@ -497,7 +497,7 @@ static int atmel_spi_setup(struct spi_de struct atmel_spi *as; u32 scbr, csr; unsigned int bits = spi->bits_per_word; - unsigned long bus_hz, sck_hz; + unsigned long bus_hz; unsigned int npcs_pin; int ret; @@ -598,10 +598,9 @@ static int atmel_spi_setup(struct spi_de spin_unlock_irqrestore(&as->lock, flags); } - sck_hz = bus_hz / scbr; dev_dbg(&spi->dev, "setup: %lu Hz bpw %u mode 0x%x -> csr%d %08x\n", - sck_hz, bits, spi->mode, spi->chip_select, csr); + bus_hz / scbr, bits, spi->mode, spi->chip_select, csr); spi_writel(as, CSR0 + 4 * spi->chip_select, csr); _ Patches currently in -mm which might be from david-b@xxxxxxxxxxx are origin.patch atmel_spi-clean-up-baud-rate-divisor-calculation.patch atmel_spi-clean-up-baud-rate-divisor-calculation-fix.patch rtc-rtc-rs5c372-smbus-conversion-support.patch rtc-rtc-rs5c732-add-support-for-ricoh-r2025s-d-rtc.patch rtc-class-driver-for-ppc_md-rtc-functions.patch rtc-class-driver-for-ppc_md-rtc-functions-fix.patch gpio-pca953x-add-support-for-pca9555-i2c-i-o-expander.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