[PATCH] Remove HARD_PPS conditionalizing

From: Christoph Egger
Date: Fri Feb 05 2010 - 07:59:53 EST


HARD_PPS is another case of unsetable CONFIG_* Item that hasn't been
touched in git history. It is currently still used in 3 source files
which this patch addresses.

Signed-off-by: Christoph Egger <siccegge@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
---
drivers/char/amiserial.c | 5 -----
drivers/serial/68360serial.c | 5 -----
include/linux/serial_core.h | 5 -----
3 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 6c32fbf..7e33af5 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -390,11 +390,6 @@ static void check_modem_status(struct async_struct *info)
icount->dsr++;
if (dstatus & SER_DCD) {
icount->dcd++;
-#ifdef CONFIG_HARD_PPS
- if ((info->flags & ASYNC_HARDPPS_CD) &&
- !(status & SER_DCD))
- hardpps();
-#endif
}
if (dstatus & SER_CTS)
icount->cts++;
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index 24661cd..dc05e36 100644
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -557,11 +557,6 @@ static _INLINE_ void check_modem_status(struct async_struct *info)
icount->dsr++;
if (status & UART_MSR_DDCD) {
icount->dcd++;
-#ifdef CONFIG_HARD_PPS
- if ((info->flags & ASYNC_HARDPPS_CD) &&
- (status & UART_MSR_DCD))
- hardpps();
-#endif
}
if (status & UART_MSR_DCTS)
icount->cts++;
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 8c3dd36..677f261 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -494,11 +494,6 @@ uart_handle_dcd_change(struct uart_port *uport, unsigned int status)

uport->icount.dcd++;

-#ifdef CONFIG_HARD_PPS
- if ((uport->flags & UPF_HARDPPS_CD) && status)
- hardpps();
-#endif
-
if (port->flags & ASYNC_CHECK_CD) {
if (status)
wake_up_interruptible(&port->open_wait);
--
1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/