Hi all!
As part of the VAMOS[0] research project at the University of
Erlangen we are looking at multiple integrity errors in linux'
configuration system.
I've been running a check on the arch/mips sourcetree for
config Items not defined in Kconfig and found 5 such cases. Sourcecode
blocks depending on these Items are not reachable from a vanilla
kernel -- dead code. I've seen such dead blocks made on purpose
e.g. while integrating new features into the kernel but generally
they're just useless.
Each of the patches in this patchset removes on such dead
config Item, I'd be glad if you consider applying them. I've been
doing deeper analysis of such issues before and can do so again but
I'm not so sure they were fastly usefull. However I've done a
testbuild on mips (cross compile from x86) with allmodconfig which
didn't show any regressions (mainline does fail at the same spots)
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/
Christoph Egger (9):
Removing dead CONFIG_SOC_AU1000_FREQUENCY
Removing dead CONFIG_GDB_CONSOLE
Removing dead CONFIG_SIBYTE_BCM1480_PROF
Removing dead CONFIG_MTD_PB1550_BOOT, CONFIG_MTD_PB1550_USER
Removing dead CONFIG_BLK_DEV_IDE
Removing dead CONFIG_I2C_PNX0105
Removing dead CONFIG_PMCTWILED
Removing dead CONFIG_DIAGNOSTICS
Removing dead CONFIG_MTD_PMC_MSP_RAMROOT
arch/mips/alchemy/common/clocks.c | 4 -
arch/mips/cavium-octeon/serial.c | 4 -
arch/mips/cavium-octeon/setup.c | 4 -
arch/mips/include/asm/mach-pb1x00/pb1550.h | 8 --
.../mips/include/asm/pmc-sierra/msp71xx/msp_prom.h | 4 -
arch/mips/mti-malta/malta-setup.c | 25 -------
arch/mips/nxp/pnx833x/common/platform.c | 73 --------------------
arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | 11 ---
arch/mips/pmc-sierra/yosemite/irq.c | 4 -
arch/mips/powertv/powertv_setup.c | 6 --
arch/mips/sibyte/bcm1480/irq.c | 11 ---
11 files changed, 0 insertions(+), 154 deletions(-)
CONFIG_SOC_AU1000_FREQUENCY doesn't exist in Kconfig, therefore
removing all references for it from the source code.
Signed-off-by: Christoph Egger <[email protected]>
---
arch/mips/alchemy/common/clocks.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/mips/alchemy/common/clocks.c b/arch/mips/alchemy/common/clocks.c
index 460c628..af0fe41 100644
--- a/arch/mips/alchemy/common/clocks.c
+++ b/arch/mips/alchemy/common/clocks.c
@@ -89,11 +89,7 @@ unsigned long au1xxx_calc_clock(void)
* over backwards trying to determine the frequency.
*/
if (au1xxx_cpu_has_pll_wo())
-#ifdef CONFIG_SOC_AU1000_FREQUENCY
- cpu_speed = CONFIG_SOC_AU1000_FREQUENCY;
-#else
cpu_speed = 396000000;
-#endif
else
cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * AU1000_SRC_CLK;
--
1.6.3.3
CONFIG_GDB_CONSOLE doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <[email protected]>
---
arch/mips/cavium-octeon/serial.c | 4 ----
arch/mips/cavium-octeon/setup.c | 4 ----
arch/mips/pmc-sierra/yosemite/irq.c | 4 ----
3 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/arch/mips/cavium-octeon/serial.c b/arch/mips/cavium-octeon/serial.c
index 83eac37..638adab 100644
--- a/arch/mips/cavium-octeon/serial.c
+++ b/arch/mips/cavium-octeon/serial.c
@@ -18,11 +18,7 @@
#include <asm/octeon/octeon.h>
-#ifdef CONFIG_GDB_CONSOLE
-#define DEBUG_UART 0
-#else
#define DEBUG_UART 1
-#endif
unsigned int octeon_serial_in(struct uart_port *up, int offset)
{
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index d1b5ffa..8c81a5c 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -578,9 +578,6 @@ void __init prom_init(void)
}
if (strstr(arcs_cmdline, "console=") == NULL) {
-#ifdef CONFIG_GDB_CONSOLE
- strcat(arcs_cmdline, " console=gdb");
-#else
#ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
strcat(arcs_cmdline, " console=ttyS0,115200");
#else
@@ -589,7 +586,6 @@ void __init prom_init(void)
else
strcat(arcs_cmdline, " console=ttyS0,115200");
#endif
-#endif
}
if (octeon_is_simulation()) {
diff --git a/arch/mips/pmc-sierra/yosemite/irq.c b/arch/mips/pmc-sierra/yosemite/irq.c
index 51021cf..25bbbf4 100644
--- a/arch/mips/pmc-sierra/yosemite/irq.c
+++ b/arch/mips/pmc-sierra/yosemite/irq.c
@@ -150,8 +150,4 @@ void __init arch_init_irq(void)
mips_cpu_irq_init();
rm7k_cpu_irq_init();
rm9k_cpu_irq_init();
-
-#ifdef CONFIG_GDB_CONSOLE
- register_gdb_console();
-#endif
}
--
1.6.3.3
CONFIG_SIBYTE_BCM1480_PROF doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <[email protected]>
---
arch/mips/sibyte/bcm1480/irq.c | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 044bbe4..919d2d5 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -362,19 +362,8 @@ asmlinkage void plat_irq_dispatch(void)
unsigned int cpu = smp_processor_id();
unsigned int pending;
-#ifdef CONFIG_SIBYTE_BCM1480_PROF
- /* Set compare to count to silence count/compare timer interrupts */
- write_c0_compare(read_c0_count());
-#endif
-
pending = read_c0_cause() & read_c0_status();
-#ifdef CONFIG_SIBYTE_BCM1480_PROF
- if (pending & CAUSEF_IP7) /* Cpu performance counter interrupt */
- sbprof_cpu_intr();
- else
-#endif
-
if (pending & CAUSEF_IP4)
do_IRQ(K_BCM1480_INT_TIMER_0 + cpu);
#ifdef CONFIG_SMP
--
1.6.3.3
CONFIG_MTD_PB1550_BOOT, CONFIG_MTD_PB1550_USER doesn't exist in
Kconfig, therefore removing all references for it from the source
code.
Signed-off-by: Christoph Egger <[email protected]>
---
arch/mips/include/asm/mach-pb1x00/pb1550.h | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/arch/mips/include/asm/mach-pb1x00/pb1550.h b/arch/mips/include/asm/mach-pb1x00/pb1550.h
index 5879641..fc4d766 100644
--- a/arch/mips/include/asm/mach-pb1x00/pb1550.h
+++ b/arch/mips/include/asm/mach-pb1x00/pb1550.h
@@ -40,14 +40,6 @@
#define SMBUS_PSC_BASE PSC2_BASE_ADDR
#define I2S_PSC_BASE PSC3_BASE_ADDR
-#if defined(CONFIG_MTD_PB1550_BOOT) && defined(CONFIG_MTD_PB1550_USER)
-#define PB1550_BOTH_BANKS
-#elif defined(CONFIG_MTD_PB1550_BOOT) && !defined(CONFIG_MTD_PB1550_USER)
-#define PB1550_BOOT_ONLY
-#elif !defined(CONFIG_MTD_PB1550_BOOT) && defined(CONFIG_MTD_PB1550_USER)
-#define PB1550_USER_ONLY
-#endif
-
/*
* Timing values as described in databook, * ns value stripped of
* lower 2 bits.
--
1.6.3.3
CONFIG_BLK_DEV_IDE doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <[email protected]>
---
arch/mips/mti-malta/malta-setup.c | 25 -------------------------
1 files changed, 0 insertions(+), 25 deletions(-)
diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c
index b7f37d4..d85143c 100644
--- a/arch/mips/mti-malta/malta-setup.c
+++ b/arch/mips/mti-malta/malta-setup.c
@@ -105,28 +105,6 @@ static void __init fd_activate(void)
}
#endif
-#ifdef CONFIG_BLK_DEV_IDE
-static void __init pci_clock_check(void)
-{
- unsigned int __iomem *jmpr_p =
- (unsigned int *) ioremap(MALTA_JMPRS_REG, sizeof(unsigned int));
- int jmpr = (__raw_readl(jmpr_p) >> 2) & 0x07;
- static const int pciclocks[] __initdata = {
- 33, 20, 25, 30, 12, 16, 37, 10
- };
- int pciclock = pciclocks[jmpr];
- char *argptr = prom_getcmdline();
-
- if (pciclock != 33 && !strstr(argptr, "idebus=")) {
- printk(KERN_WARNING "WARNING: PCI clock is %dMHz, "
- "setting idebus\n", pciclock);
- argptr += strlen(argptr);
- sprintf(argptr, " idebus=%d", pciclock);
- if (pciclock < 20 || pciclock > 66)
- printk(KERN_WARNING "WARNING: IDE timing "
- "calculations will be incorrect\n");
- }
-}
#endif
#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
@@ -207,9 +185,6 @@ void __init plat_mem_setup(void)
if (mips_revision_sconid == MIPS_REVISION_SCON_BONITO)
bonito_quirks_setup();
-#ifdef CONFIG_BLK_DEV_IDE
- pci_clock_check();
-#endif
#ifdef CONFIG_BLK_DEV_FD
fd_activate();
--
1.6.3.3
CONFIG_I2C_PNX0105 doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <[email protected]>
---
arch/mips/nxp/pnx833x/common/platform.c | 73 -------------------------------
1 files changed, 0 insertions(+), 73 deletions(-)
diff --git a/arch/mips/nxp/pnx833x/common/platform.c b/arch/mips/nxp/pnx833x/common/platform.c
index 01f8345..2698d19 100644
--- a/arch/mips/nxp/pnx833x/common/platform.c
+++ b/arch/mips/nxp/pnx833x/common/platform.c
@@ -33,11 +33,6 @@
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
-#ifdef CONFIG_I2C_PNX0105
-/* Until i2c driver available in kernel.*/
-#include <linux/i2c-pnx0105.h>
-#endif
-
#include <irq.h>
#include <irq-mapping.h>
#include <pnx833x.h>
@@ -134,70 +129,6 @@ static struct platform_device pnx833x_usb_ehci_device = {
.resource = pnx833x_usb_ehci_resources,
};
-#ifdef CONFIG_I2C_PNX0105
-static struct resource pnx833x_i2c0_resources[] = {
- {
- .start = PNX833X_I2C0_PORTS_START,
- .end = PNX833X_I2C0_PORTS_END,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = PNX833X_PIC_I2C0_INT,
- .end = PNX833X_PIC_I2C0_INT,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct resource pnx833x_i2c1_resources[] = {
- {
- .start = PNX833X_I2C1_PORTS_START,
- .end = PNX833X_I2C1_PORTS_END,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = PNX833X_PIC_I2C1_INT,
- .end = PNX833X_PIC_I2C1_INT,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct i2c_pnx0105_dev pnx833x_i2c_dev[] = {
- {
- .base = PNX833X_I2C0_PORTS_START,
- .irq = -1, /* should be PNX833X_PIC_I2C0_INT but polling is faster */
- .clock = 6, /* 0 == 400 kHz, 4 == 100 kHz(Maximum HDMI), 6 = 50kHz(Prefered HDCP) */
- .bus_addr = 0, /* no slave support */
- },
- {
- .base = PNX833X_I2C1_PORTS_START,
- .irq = -1, /* on high freq, polling is faster */
- /*.irq = PNX833X_PIC_I2C1_INT,*/
- .clock = 4, /* 0 == 400 kHz, 4 == 100 kHz. 100 kHz seems a safe default for now */
- .bus_addr = 0, /* no slave support */
- },
-};
-
-static struct platform_device pnx833x_i2c0_device = {
- .name = "i2c-pnx0105",
- .id = 0,
- .dev = {
- .platform_data = &pnx833x_i2c_dev[0],
- },
- .num_resources = ARRAY_SIZE(pnx833x_i2c0_resources),
- .resource = pnx833x_i2c0_resources,
-};
-
-static struct platform_device pnx833x_i2c1_device = {
- .name = "i2c-pnx0105",
- .id = 1,
- .dev = {
- .platform_data = &pnx833x_i2c_dev[1],
- },
- .num_resources = ARRAY_SIZE(pnx833x_i2c1_resources),
- .resource = pnx833x_i2c1_resources,
-};
-#endif
-
static u64 ethernet_dmamask = DMA_BIT_MASK(32);
static struct resource pnx833x_ethernet_resources[] = {
@@ -297,10 +228,6 @@ static struct platform_device pnx833x_flash_nand = {
static struct platform_device *pnx833x_platform_devices[] __initdata = {
&pnx833x_uart_device,
&pnx833x_usb_ehci_device,
-#ifdef CONFIG_I2C_PNX0105
- &pnx833x_i2c0_device,
- &pnx833x_i2c1_device,
-#endif
&pnx833x_ethernet_device,
&pnx833x_sata_device,
&pnx833x_flash_nand,
--
1.6.3.3
CONFIG_PMCTWILED doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <[email protected]>
---
arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
index 11769b5..c841f08 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
@@ -32,9 +32,6 @@
#include <msp_int.h>
#include <msp_regs.h>
#include <msp_regops.h>
-#ifdef CONFIG_PMCTWILED
-#include <msp_led_macros.h>
-#endif
/* For hwbutton_interrupt->initial_state */
#define HWBUTTON_HI 0x1
@@ -82,10 +79,6 @@ static void standby_on(void *data)
printk(KERN_WARNING "STANDBY switch was set to ON (not implemented)\n");
/* TODO: Put board in standby mode */
-#ifdef CONFIG_PMCTWILED
- msp_led_turn_off(MSP_LED_PWRSTANDBY_GREEN);
- msp_led_turn_on(MSP_LED_PWRSTANDBY_RED);
-#endif
}
static void standby_off(void *data)
@@ -94,10 +87,6 @@ static void standby_off(void *data)
"STANDBY switch was set to OFF (not implemented)\n");
/* TODO: Take out of standby mode */
-#ifdef CONFIG_PMCTWILED
- msp_led_turn_on(MSP_LED_PWRSTANDBY_GREEN);
- msp_led_turn_off(MSP_LED_PWRSTANDBY_RED);
-#endif
}
static struct hwbutton_interrupt softreset_sw = {
--
1.6.3.3
CONFIG_DIAGNOSTICS doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <[email protected]>
---
arch/mips/powertv/powertv_setup.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/arch/mips/powertv/powertv_setup.c b/arch/mips/powertv/powertv_setup.c
index af2cae0..3933c37 100644
--- a/arch/mips/powertv/powertv_setup.c
+++ b/arch/mips/powertv/powertv_setup.c
@@ -199,14 +199,8 @@ static int panic_handler(struct notifier_block *notifier_block,
my_regs.cp0_status = read_c0_status();
}
-#ifdef CONFIG_DIAGNOSTICS
- failure_report((char *) cause_string,
- have_die_regs ? &die_regs : &my_regs);
- have_die_regs = false;
-#else
pr_crit("I'm feeling a bit sleepy. hmmmmm... perhaps a nap would... "
"zzzz... \n");
-#endif
return NOTIFY_DONE;
}
--
1.6.3.3
CONFIG_MTD_PMC_MSP_RAMROOT doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <[email protected]>
---
.../mips/include/asm/pmc-sierra/msp71xx/msp_prom.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h
index 54ef1a9..786d82d 100644
--- a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h
+++ b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h
@@ -124,10 +124,6 @@ extern void prom_meminit(void);
extern void prom_fixup_mem_map(unsigned long start_mem,
unsigned long end_mem);
-#ifdef CONFIG_MTD_PMC_MSP_RAMROOT
-extern bool get_ramroot(void **start, unsigned long *size);
-#endif
-
extern int get_ethernet_addr(char *ethaddr_name, char *ethernet_addr);
extern unsigned long get_deviceid(void);
extern char identify_enet(unsigned long interface_num);
--
1.6.3.3
On Wed, Jun 9, 2010 at 1:22 PM, Christoph Egger <[email protected]> wrote:
> CONFIG_I2C_PNX0105 doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
The code should probably just be adjusted to use the i2c-pnx driver. According
to the comments it supports the pnx0105 i2c cell.
Manuel
On 06/09/2010 04:20 AM, Christoph Egger wrote:
> CONFIG_GDB_CONSOLE doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger<[email protected]>
Acked-by: David Daney <[email protected]>
> ---
> arch/mips/cavium-octeon/serial.c | 4 ----
> arch/mips/cavium-octeon/setup.c | 4 ----
> arch/mips/pmc-sierra/yosemite/irq.c | 4 ----
> 3 files changed, 0 insertions(+), 12 deletions(-)
>
On Wed, Jun 9, 2010 at 5:23 AM, Christoph Egger <[email protected]> wrote:
>
> CONFIG_MTD_PMC_MSP_RAMROOT doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <[email protected]>
> ---
> ?.../mips/include/asm/pmc-sierra/msp71xx/msp_prom.h | ? ?4 ----
> ?1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h
> index 54ef1a9..786d82d 100644
> --- a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h
> +++ b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h
> @@ -124,10 +124,6 @@ extern void prom_meminit(void);
> ?extern void prom_fixup_mem_map(unsigned long start_mem,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? unsigned long end_mem);
>
> -#ifdef CONFIG_MTD_PMC_MSP_RAMROOT
> -extern bool get_ramroot(void **start, unsigned long *size);
> -#endif
> -
> ?extern int get_ethernet_addr(char *ethaddr_name, char *ethernet_addr);
> ?extern unsigned long get_deviceid(void);
> ?extern char identify_enet(unsigned long interface_num);
> --
> 1.6.3.3
Good catch! This should have been included in the patch that
removed the CONFIG_MTD_PMC_MSP_RAMROOT functionality:
http://www.linux-mips.org/archives/linux-mips/2009-05/msg00024.html
Acked-by: Shane McDonald <[email protected]>
On Wed, Jun 9, 2010 at 5:21 AM, Christoph Egger <[email protected]> wrote:
> CONFIG_BLK_DEV_IDE doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <[email protected]>
> ---
> ?arch/mips/mti-malta/malta-setup.c | ? 25 -------------------------
> ?1 files changed, 0 insertions(+), 25 deletions(-)
>
> diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c
> index b7f37d4..d85143c 100644
> --- a/arch/mips/mti-malta/malta-setup.c
> +++ b/arch/mips/mti-malta/malta-setup.c
> @@ -105,28 +105,6 @@ static void __init fd_activate(void)
> ?}
> ?#endif
>
> -#ifdef CONFIG_BLK_DEV_IDE
> -static void __init pci_clock_check(void)
> -{
> - ? ? ? unsigned int __iomem *jmpr_p =
> - ? ? ? ? ? ? ? (unsigned int *) ioremap(MALTA_JMPRS_REG, sizeof(unsigned int));
> - ? ? ? int jmpr = (__raw_readl(jmpr_p) >> 2) & 0x07;
> - ? ? ? static const int pciclocks[] __initdata = {
> - ? ? ? ? ? ? ? 33, 20, 25, 30, 12, 16, 37, 10
> - ? ? ? };
> - ? ? ? int pciclock = pciclocks[jmpr];
> - ? ? ? char *argptr = prom_getcmdline();
> -
> - ? ? ? if (pciclock != 33 && !strstr(argptr, "idebus=")) {
> - ? ? ? ? ? ? ? printk(KERN_WARNING "WARNING: PCI clock is %dMHz, "
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? "setting idebus\n", pciclock);
> - ? ? ? ? ? ? ? argptr += strlen(argptr);
> - ? ? ? ? ? ? ? sprintf(argptr, " idebus=%d", pciclock);
> - ? ? ? ? ? ? ? if (pciclock < 20 || pciclock > 66)
> - ? ? ? ? ? ? ? ? ? ? ? printk(KERN_WARNING "WARNING: IDE timing "
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? "calculations will be incorrect\n");
> - ? ? ? }
> -}
> ?#endif
>
> ?#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
> @@ -207,9 +185,6 @@ void __init plat_mem_setup(void)
> ? ? ? ?if (mips_revision_sconid == MIPS_REVISION_SCON_BONITO)
> ? ? ? ? ? ? ? ?bonito_quirks_setup();
>
> -#ifdef CONFIG_BLK_DEV_IDE
> - ? ? ? pci_clock_check();
> -#endif
>
> ?#ifdef CONFIG_BLK_DEV_FD
> ? ? ? ?fd_activate();
> --
> 1.6.3.3
I wonder if, instead of deleting the code, the constant should be
changed from CONFIG_BLK_DEV_IDE to CONFIG_IDE. The original
patch that removed CONFIG_BLK_DEV_IDE seemed to make this change:
http://kerneltrap.org/mailarchive/linux-kernel/2008/8/13/2929444
Shane
On Wed, Jun 9, 2010 at 5:22 AM, Christoph Egger <[email protected]> wrote:
> CONFIG_PMCTWILED doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <[email protected]>
> ---
> ?arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | ? 11 -----------
> ?1 files changed, 0 insertions(+), 11 deletions(-)
>
> diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
> index 11769b5..c841f08 100644
> --- a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
> +++ b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
> @@ -32,9 +32,6 @@
> ?#include <msp_int.h>
> ?#include <msp_regs.h>
> ?#include <msp_regops.h>
> -#ifdef CONFIG_PMCTWILED
> -#include <msp_led_macros.h>
> -#endif
>
> ?/* For hwbutton_interrupt->initial_state */
> ?#define HWBUTTON_HI ? ?0x1
> @@ -82,10 +79,6 @@ static void standby_on(void *data)
> ? ? ? ?printk(KERN_WARNING "STANDBY switch was set to ON (not implemented)\n");
>
> ? ? ? ?/* TODO: Put board in standby mode */
> -#ifdef CONFIG_PMCTWILED
> - ? ? ? msp_led_turn_off(MSP_LED_PWRSTANDBY_GREEN);
> - ? ? ? msp_led_turn_on(MSP_LED_PWRSTANDBY_RED);
> -#endif
> ?}
>
> ?static void standby_off(void *data)
> @@ -94,10 +87,6 @@ static void standby_off(void *data)
> ? ? ? ? ? ? ? ?"STANDBY switch was set to OFF (not implemented)\n");
>
> ? ? ? ?/* TODO: Take out of standby mode */
> -#ifdef CONFIG_PMCTWILED
> - ? ? ? msp_led_turn_on(MSP_LED_PWRSTANDBY_GREEN);
> - ? ? ? msp_led_turn_off(MSP_LED_PWRSTANDBY_RED);
> -#endif
> ?}
>
> ?static struct hwbutton_interrupt softreset_sw = {
> --
> 1.6.3.3
This constant was added in a patch that was never accepted:
http://www.linux-mips.org/archives/linux-mips/2007-03/msg00421.html.
Because this patch was submitted over 3 years ago, I think
it's reasonable to assume that work on the patch has stalled,
and so I think removing the CONFIG_PMCTWILED constant
makes sense.
I seem to be the only person semi-actively doing anything
with the MSP7120 code base, so if I ever try to clean up the
patch and re-submit, I'll re-submit the changes being
removed in this patch.
Acked-by: Shane McDonald <[email protected]>
On Thu, Jun 10, 2010 at 12:23:06PM -0600, Shane McDonald wrote:
> I wonder if, instead of deleting the code, the constant should be
> changed from CONFIG_BLK_DEV_IDE to CONFIG_IDE. The original
> patch that removed CONFIG_BLK_DEV_IDE seemed to make this change:
> http://kerneltrap.org/mailarchive/linux-kernel/2008/8/13/2929444
>
> Shane
You're probably right, updated patch below
-------
From: Christoph Egger <[email protected]>
Date: Mon, 7 Jun 2010 17:29:48 +0200
Subject: [PATCH 5/9] Removing dead CONFIG_BLK_DEV_IDE
CONFIG_BLK_DEV_IDE doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <[email protected]>
---
diff --git a/arch/mips/mti-malta/malta-setup.c
b/arch/mips/mti-malta/malta-setup.c
index b7f37d4..f6a5ea8 100644
--- a/arch/mips/mti-malta/malta-setup.c
+++ b/arch/mips/mti-malta/malta-setup.c
@@ -105,7 +105,7 @@ static void __init fd_activate(void)
}
#endif
-#ifdef CONFIG_BLK_DEV_IDE
+#ifdef CONFIG_IDE
static void __init pci_clock_check(void)
{
unsigned int __iomem *jmpr_p =
@@ -207,7 +207,7 @@ void __init plat_mem_setup(void)
if (mips_revision_sconid == MIPS_REVISION_SCON_BONITO)
bonito_quirks_setup();
-#ifdef CONFIG_BLK_DEV_IDE
+#ifdef CONFIG_IDE
pci_clock_check();
#endif
On Wed, 9 Jun 2010, Christoph Egger wrote:
> CONFIG_SIBYTE_BCM1480_PROF doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
The patch isn't present in linux-next as of today. I have applied it to my
tree, thanks.
>
> Signed-off-by: Christoph Egger <[email protected]>
> ---
> arch/mips/sibyte/bcm1480/irq.c | 11 -----------
> 1 files changed, 0 insertions(+), 11 deletions(-)
>
> diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
> index 044bbe4..919d2d5 100644
> --- a/arch/mips/sibyte/bcm1480/irq.c
> +++ b/arch/mips/sibyte/bcm1480/irq.c
> @@ -362,19 +362,8 @@ asmlinkage void plat_irq_dispatch(void)
> unsigned int cpu = smp_processor_id();
> unsigned int pending;
>
> -#ifdef CONFIG_SIBYTE_BCM1480_PROF
> - /* Set compare to count to silence count/compare timer interrupts */
> - write_c0_compare(read_c0_count());
> -#endif
> -
> pending = read_c0_cause() & read_c0_status();
>
> -#ifdef CONFIG_SIBYTE_BCM1480_PROF
> - if (pending & CAUSEF_IP7) /* Cpu performance counter interrupt */
> - sbprof_cpu_intr();
> - else
> -#endif
> -
> if (pending & CAUSEF_IP4)
> do_IRQ(K_BCM1480_INT_TIMER_0 + cpu);
> #ifdef CONFIG_SMP
> --
> 1.6.3.3
>
--
Jiri Kosina
SUSE Labs, Novell Inc.
On Wed, Jun 09, 2010 at 01:20:23PM +0200, Christoph Egger wrote:
> CONFIG_SOC_AU1000_FREQUENCY doesn't exist in Kconfig, therefore
> removing all references for it from the source code.
Not comments received and seems to make sense so I queued this one for
2.6.36.
Thanks,
Ralf
On Wed, Jun 16, 2010 at 06:00:59PM +0200, Jiri Kosina wrote:
> On Wed, 9 Jun 2010, Christoph Egger wrote:
>
> > CONFIG_SIBYTE_BCM1480_PROF doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
>
> The patch isn't present in linux-next as of today. I have applied it to my
> tree, thanks.
Nack. This only need to be rewired to use the ZBus profiler just like
the SB1250 already does. It's the virtually same hardware after all!
Ralf
Thanks folks. Queued for 2.6.36 as well.
Ralf
On Mon, 28 Jun 2010, Ralf Baechle wrote:
> > > CONFIG_SIBYTE_BCM1480_PROF doesn't exist in Kconfig, therefore removing all
> > > references for it from the source code.
> >
> > The patch isn't present in linux-next as of today. I have applied it to my
> > tree, thanks.
>
> Nack. This only need to be rewired to use the ZBus profiler just like
> the SB1250 already does. It's the virtually same hardware after all!
Well, still it's dead code guarded by ifdef depending on non-exsiting
symbol ... I have just quickly tried to get a grip on the zbus thing, but
arch/mips/configs/bigsur_defconfig:CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y
arch/mips/configs/sb1250-swarm_defconfig:CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y
1arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
arch/mips/sibyte/Kconfig: depends on SIBYTE_HAS_ZBUS_PROFILING
arch/mips/sibyte/Kconfig:config SIBYTE_HAS_ZBUS_PROFILING
seem to be the only occurences in the whole tree. Another unused symbol?
So I'll revert that patch in my tree as it has been nacked by maintainer,
but the feeling that cleanup is needed is still there.
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
On Wed, 30 Jun 2010, Jiri Kosina wrote:
> Well, still it's dead code guarded by ifdef depending on non-exsiting
> symbol ... I have just quickly tried to get a grip on the zbus thing, but
You've missed...
> arch/mips/configs/bigsur_defconfig:CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y
> arch/mips/configs/sb1250-swarm_defconfig:CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y
> arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
... this:
arch/mips/sibyte/Kconfig: config SIBYTE_TBPROF
arch/mips/sibyte/Kconfig: tristate "Support for ZBbus profiling"
> arch/mips/sibyte/Kconfig: depends on SIBYTE_HAS_ZBUS_PROFILING
^^^ here.
> arch/mips/sibyte/Kconfig:config SIBYTE_HAS_ZBUS_PROFILING
>
> seem to be the only occurences in the whole tree. Another unused symbol?
Not quite so then.
Maciej
On Wed, 30 Jun 2010, Maciej W. Rozycki wrote:
> > Well, still it's dead code guarded by ifdef depending on non-exsiting
> > symbol ... I have just quickly tried to get a grip on the zbus thing, but
>
> You've missed...
>
> > arch/mips/configs/bigsur_defconfig:CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y
> > arch/mips/configs/sb1250-swarm_defconfig:CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y
> > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
>
> ... this:
>
> arch/mips/sibyte/Kconfig: config SIBYTE_TBPROF
> arch/mips/sibyte/Kconfig: tristate "Support for ZBbus profiling"
> > arch/mips/sibyte/Kconfig: depends on SIBYTE_HAS_ZBUS_PROFILING
>
> ^^^ here.
>
> > arch/mips/sibyte/Kconfig:config SIBYTE_HAS_ZBUS_PROFILING
> >
> > seem to be the only occurences in the whole tree. Another unused symbol?
>
> Not quite so then.
Right you are, sorry for the noise.
--
Jiri Kosina
SUSE Labs, Novell Inc.
On Wed, Jun 09, 2010 at 01:21:30PM +0200, Christoph Egger wrote:
> CONFIG_MTD_PB1550_BOOT, CONFIG_MTD_PB1550_USER doesn't exist in
> Kconfig, therefore removing all references for it from the source
> code.
>
> Signed-off-by: Christoph Egger <[email protected]>
Queued for 2.6.26. When I dug deep in git I didn't want to wait for git
to actually find the last real use of CONFIG_MTD_PB1550_USER - maybe it
was never actually used.
Thanks,
Ralf
On Wed, Jun 30, 2010 at 03:38:30PM +0200, Jiri Kosina wrote:
> > > Well, still it's dead code guarded by ifdef depending on non-exsiting
> > > symbol ... I have just quickly tried to get a grip on the zbus thing, but
> >
> > You've missed...
> >
> > > arch/mips/configs/bigsur_defconfig:CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y
> > > arch/mips/configs/sb1250-swarm_defconfig:CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y
> > > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> > > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> > > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> > > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> > > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> > > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> > > arch/mips/sibyte/Kconfig: select SIBYTE_HAS_ZBUS_PROFILING
> >
> > ... this:
> >
> > arch/mips/sibyte/Kconfig: config SIBYTE_TBPROF
> > arch/mips/sibyte/Kconfig: tristate "Support for ZBbus profiling"
> > > arch/mips/sibyte/Kconfig: depends on SIBYTE_HAS_ZBUS_PROFILING
> >
> > ^^^ here.
> >
> > > arch/mips/sibyte/Kconfig:config SIBYTE_HAS_ZBUS_PROFILING
> > >
> > > seem to be the only occurences in the whole tree. Another unused symbol?
> >
> > Not quite so then.
>
> Right you are, sorry for the noise.
So I've dropped this one from my own patch list then.
Ralf
On Wed, Jun 16, 2010 at 01:35:48PM +0200, Christoph Egger wrote:
> On Thu, Jun 10, 2010 at 12:23:06PM -0600, Shane McDonald wrote:
> > I wonder if, instead of deleting the code, the constant should be
> > changed from CONFIG_BLK_DEV_IDE to CONFIG_IDE. The original
> > patch that removed CONFIG_BLK_DEV_IDE seemed to make this change:
> > http://kerneltrap.org/mailarchive/linux-kernel/2008/8/13/2929444
> >
> > Shane
>
> You're probably right, updated patch below
>
> -------
> From: Christoph Egger <[email protected]>
> Date: Mon, 7 Jun 2010 17:29:48 +0200
> Subject: [PATCH 5/9] Removing dead CONFIG_BLK_DEV_IDE
>
> CONFIG_BLK_DEV_IDE doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <[email protected]>
> ---
> diff --git a/arch/mips/mti-malta/malta-setup.c
> b/arch/mips/mti-malta/malta-setup.c
> index b7f37d4..f6a5ea8 100644
> --- a/arch/mips/mti-malta/malta-setup.c
> +++ b/arch/mips/mti-malta/malta-setup.c
> @@ -105,7 +105,7 @@ static void __init fd_activate(void)
> }
> #endif
>
> -#ifdef CONFIG_BLK_DEV_IDE
> +#ifdef CONFIG_IDE
This doesn't fly too well either. CONFIG_BLK_DEV_IDE was a bool but
CONFIG_IDE is tristate. But changing the ifdef to
#if defined(CONFIG_IDE) || defined(CONFIG_IDE_MODULE)
wouldn't really work either. I think this needs some generic infrastructure
to get the PCI clock.
Or maybe this is just another reason to scrap IDE support.
Ralf
On Wed, Jun 09, 2010 at 01:47:33PM +0200, Manuel Lauss wrote:
> The code should probably just be adjusted to use the i2c-pnx driver.
> According to the comments it supports the pnx0105 i2c cell.
So something like this then.
Signed-off-by: Ralf Baechle <[email protected]>
arch/mips/pnx833x/common/platform.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
Index: linux-queue/arch/mips/pnx833x/common/platform.c
===================================================================
--- linux-queue.orig/arch/mips/pnx833x/common/platform.c
+++ linux-queue/arch/mips/pnx833x/common/platform.c
@@ -24,6 +24,7 @@
*/
#include <linux/device.h>
#include <linux/dma-mapping.h>
+#include <linux/i2c-pnx.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@ -33,11 +34,6 @@
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
-#ifdef CONFIG_I2C_PNX0105
-/* Until i2c driver available in kernel.*/
-#include <linux/i2c-pnx0105.h>
-#endif
-
#include <irq.h>
#include <irq-mapping.h>
#include <pnx833x.h>
@@ -134,7 +130,6 @@ static struct platform_device pnx833x_us
.resource = pnx833x_usb_ehci_resources,
};
-#ifdef CONFIG_I2C_PNX0105
static struct resource pnx833x_i2c0_resources[] = {
{
.start = PNX833X_I2C0_PORTS_START,
@@ -188,7 +183,7 @@ static struct platform_device pnx833x_i2
};
static struct platform_device pnx833x_i2c1_device = {
- .name = "i2c-pnx0105",
+ .name = "pnx-i2c",
.id = 1,
.dev = {
.platform_data = &pnx833x_i2c_dev[1],
@@ -196,7 +191,6 @@ static struct platform_device pnx833x_i2
.num_resources = ARRAY_SIZE(pnx833x_i2c1_resources),
.resource = pnx833x_i2c1_resources,
};
-#endif
static u64 ethernet_dmamask = DMA_BIT_MASK(32);
@@ -297,10 +291,8 @@ static struct platform_device pnx833x_fl
static struct platform_device *pnx833x_platform_devices[] __initdata = {
&pnx833x_uart_device,
&pnx833x_usb_ehci_device,
-#ifdef CONFIG_I2C_PNX0105
&pnx833x_i2c0_device,
&pnx833x_i2c1_device,
-#endif
&pnx833x_ethernet_device,
&pnx833x_sata_device,
&pnx833x_flash_nand,
On Thu, Jun 10, 2010 at 01:24:08PM -0600, Shane McDonald wrote:
> On Wed, Jun 9, 2010 at 5:22 AM, Christoph Egger <[email protected]> wrote:
> > CONFIG_PMCTWILED doesn't exist in Kconfig, therefore removing all
> > references for it from the source code.
> >
> > Signed-off-by: Christoph Egger <[email protected]>
Queued for 2.6.26. Thanks,
Ralf
On Wed, Jun 09, 2010 at 01:23:02PM +0200, Christoph Egger wrote:
No comments received and seems to make sense so queued for 2.6.36.
Thanks,
Ralf
Thanks, also queued for 2.6.26.
Ralf