2010-02-05 13:47:08

by Christoph Egger

[permalink] [raw]
Subject: [PATCH] obsolete config in kernel source (HARD_PPS)

Hi all!

As part of the VAMOS[0] research project at the University of
Erlangen we're checking referential integrity between kernel KConfig
options and in-code Conditional blocks.

There are a bunch of files in the current linux tree checking
for CONFIG_HARD_PPS which isn't in KConfig neither any other media of
setting it as far as I can tell and has been like this for ages.

As this is seemingly unnecessary and a bit confusing when
going over the tree it migt be beneficial to clean out these parts
from the actual source.

Please keep me informed of this patch getting confirmed /
merged so we can keep track of it.

Regards

Christoph Egger

[0] http://vamos1.informatik.uni-erlangen.de/

----
>From f0276583080d5732f160b9dcf6f45caddac3a999 Mon Sep 17 00:00:00 2001
From: Christoph Egger <[email protected]>
Date: Fri, 5 Feb 2010 13:59:53 +0100
Subject: [PATCH] Remove HARD_PPS conditionalizing

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 <[email protected]>
---
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


2010-02-05 15:57:19

by Alan

[permalink] [raw]
Subject: Re: [PATCH] obsolete config in kernel source (HARD_PPS)

> There are a bunch of files in the current linux tree checking
> for CONFIG_HARD_PPS which isn't in KConfig neither any other media of
> setting it as far as I can tell and has been like this for ages.

HARD_PPS isn't yet upstream but having the hooks there is useful in the
meantime

2010-02-05 17:05:10

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH] obsolete config in kernel source (HARD_PPS)

On Fri, Feb 05, 2010 at 02:39:37PM +0000, Alan Cox wrote:
> > There are a bunch of files in the current linux tree checking
> > for CONFIG_HARD_PPS which isn't in KConfig neither any other media of
> > setting it as far as I can tell and has been like this for ages.
>
> HARD_PPS isn't yet upstream but having the hooks there is useful in the
> meantime

Ok, I'll ignore this patch.

thanks,

greg k-h