The patch titled
delay: remove references to MAX_UDELAY_MS; fix comment
has been removed from the -mm tree. Its filename is
delay-remove-references-to-max_udelay_ms-fix-comment.patch
This patch was dropped because powerpc broke - its mdelay() is a macro
------------------------------------------------------
Subject: delay: remove references to MAX_UDELAY_MS; fix comment
From: Denis Vlasenko <vda.linux@xxxxxxxxxxxxxx>
We are going to kill MAX_UDELAY_MS, so replace it in common code with 1. Also
fix a buglet on the way: mpc83xx_spi->nsecs > MAX_UDELAY_MS * 1000 was
comparing nanoseconds to microseconds.
Signed-off-by: Denis Vlasenko <vda.linux@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/ipr.c | 6 +-----
drivers/spi/spi_bitbang.c | 2 +-
drivers/spi/spi_mpc83xx.c | 2 +-
include/asm-parisc/delay.h | 5 ++---
4 files changed, 5 insertions(+), 10 deletions(-)
diff -puN drivers/scsi/ipr.c~delay-remove-references-to-max_udelay_ms-fix-comment drivers/scsi/ipr.c
--- a/drivers/scsi/ipr.c~delay-remove-references-to-max_udelay_ms-fix-comment
+++ a/drivers/scsi/ipr.c
@@ -1624,11 +1624,7 @@ static int ipr_wait_iodbg_ack(struct ipr
if (pcii_reg & IPR_PCII_IO_DEBUG_ACKNOWLEDGE)
return 0;
- /* udelay cannot be used if delay is more than a few milliseconds */
- if ((delay / 1000) > MAX_UDELAY_MS)
- mdelay(delay / 1000);
- else
- udelay(delay);
+ udelay(delay);
delay += delay;
}
diff -puN drivers/spi/spi_bitbang.c~delay-remove-references-to-max_udelay_ms-fix-comment drivers/spi/spi_bitbang.c
--- a/drivers/spi/spi_bitbang.c~delay-remove-references-to-max_udelay_ms-fix-comment
+++ a/drivers/spi/spi_bitbang.c
@@ -168,7 +168,7 @@ int spi_bitbang_setup_transfer(struct sp
hz = spi->max_speed_hz;
if (hz) {
cs->nsecs = (1000000000/2) / hz;
- if (cs->nsecs > (MAX_UDELAY_MS * 1000 * 1000))
+ if (cs->nsecs > (1000 * 1000))
return -EINVAL;
}
diff -puN drivers/spi/spi_mpc83xx.c~delay-remove-references-to-max_udelay_ms-fix-comment drivers/spi/spi_mpc83xx.c
--- a/drivers/spi/spi_mpc83xx.c~delay-remove-references-to-max_udelay_ms-fix-comment
+++ a/drivers/spi/spi_mpc83xx.c
@@ -211,7 +211,7 @@ int mpc83xx_spi_setup_transfer(struct sp
if (!hz)
hz = spi->max_speed_hz;
mpc83xx_spi->nsecs = (1000000000 / 2) / hz;
- if (mpc83xx_spi->nsecs > MAX_UDELAY_MS * 1000)
+ if (mpc83xx_spi->nsecs > (1000 * 1000))
return -EINVAL;
if (bits_per_word == 32)
diff -puN include/asm-parisc/delay.h~delay-remove-references-to-max_udelay_ms-fix-comment include/asm-parisc/delay.h
--- a/include/asm-parisc/delay.h~delay-remove-references-to-max_udelay_ms-fix-comment
+++ a/include/asm-parisc/delay.h
@@ -24,9 +24,8 @@ static __inline__ void __cr16_delay(unsi
/*
* Note: Due to unsigned math, cr16 rollovers shouldn't be
- * a problem here. However, on 32 bit, we need to make sure
- * we don't pass in too big a value. The current default
- * value of MAX_UDELAY_MS should help prevent this.
+ * a problem here. On 32 bit, we are protected in udelay()
+ * from passing in too big a value.
*/
start = mfctl(16);
_
Patches currently in -mm which might be from vda.linux@xxxxxxxxxxxxxx are
git-drm.patch
aic7xxx-fix-byte-i-o-order-in-ahd_inw.patch
delay-remove-references-to-max_udelay_ms-fix-comment.patch
delay-add-generic-udelay-mdelay-and-ssleep.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
