[PATCH 0/3] Removing dead code

[PATCH 0/3] Removing dead code

[Christian Dietrich]

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 drivers/usb sourcetree for
config Items not defined in Kconfig and found 3 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.

        I build the patches against a vanilla kernel in order to
try if the kernel compiles with this patches

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

Regards

        Christian Dietrich

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

Christian Dietrich (3):
  usb/gadget: Remove dead CONFIG_USB_LANGWELL_OTG
  usb/{gadget,host}: Remove dead CONFIG_CPU_PXA27x
  usb/host || arch/arm: Remove dead CONFIG_ARCH_KARO

 arch/arm/tools/mach-types         |    1 -
 drivers/usb/gadget/langwell_udc.c |   84 +------------------------------------
 drivers/usb/gadget/langwell_udc.h |    5 --
 drivers/usb/gadget/pxa27x_udc.c   |   16 -------
 drivers/usb/host/isp1362.h        |   24 +----------
 drivers/usb/host/ohci-pxa27x.c    |    8 ----
 6 files changed, 2 insertions(+), 136 deletions(-)

[PATCH 2/3] usb/{gadget,host}: Remove dead CONFIG_CPU_PXA27x

[Christian Dietrich]

CONFIG_CPU_PXA27x doesn't exist in Kconfig, therefore removing all
references for it from the source code.

Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
---
 drivers/usb/gadget/pxa27x_udc.c |   16 ----------------
 drivers/usb/host/ohci-pxa27x.c  |    8 --------
 2 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 85b0d89..73783f5 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -2561,12 +2561,6 @@ static void pxa_udc_shutdown(struct platform_device *_dev)
 		udc_disable(udc);
 }
 
-#ifdef CONFIG_CPU_PXA27x
-extern void pxa27x_clear_otgph(void);
-#else
-#define pxa27x_clear_otgph()   do {} while (0)
-#endif
-
 #ifdef CONFIG_PM
 /**
  * pxa_udc_suspend - Suspend udc device
@@ -2625,16 +2619,6 @@ static int pxa_udc_resume(struct platform_device *_dev)
 	dplus_pullup(udc, udc->pullup_resume);
 	if (should_enable_udc(udc))
 		udc_enable(udc);
-	/*
-	 * We do not handle OTG yet.
-	 *
-	 * OTGPH bit is set when sleep mode is entered.
-	 * it indicates that OTG pad is retaining its state.
-	 * Upon exit from sleep mode and before clearing OTGPH,
-	 * Software must configure the USB OTG pad, UDC, and UHC
-	 * to the state they were in before entering sleep mode.
-	 */
-	pxa27x_clear_otgph();
 
 	return 0;
 }
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index a18debd..227bdf0 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -203,12 +203,6 @@ static inline void pxa27x_reset_hc(struct pxa27x_ohci *ohci)
 	__raw_writel(uhchr & ~UHCHR_FHR, ohci->mmio_base + UHCHR);
 }
 
-#ifdef CONFIG_CPU_PXA27x
-extern void pxa27x_clear_otgph(void);
-#else
-#define pxa27x_clear_otgph()	do {} while (0)
-#endif
-
 static int pxa27x_start_hc(struct pxa27x_ohci *ohci, struct device *dev)
 {
 	int retval = 0;
@@ -239,8 +233,6 @@ static int pxa27x_start_hc(struct pxa27x_ohci *ohci, struct device *dev)
 	__raw_writel(uhchr, ohci->mmio_base + UHCHR);
 	__raw_writel(UHCHIE_UPRIE | UHCHIE_RWIE, ohci->mmio_base + UHCHIE);
 
-	/* Clear any OTG Pin Hold */
-	pxa27x_clear_otgph();
 	return 0;
 }
 
-- 
1.7.0.4

[PATCH 3/3] usb/host || arch/arm: Remove dead CONFIG_ARCH_KARO

[Christian Dietrich]

CONFIG_ARCH_KARO doesn't exist in Kconfig and is never defined anywhere
else, therefore removing all references for it from the source code.

Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
---
 arch/arm/tools/mach-types  |    1 -
 drivers/usb/host/isp1362.h |   24 +-----------------------
 2 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 8f10d24..3d86318 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -204,7 +204,6 @@ omaha			ARCH_OMAHA		OMAHA			186
 ta7			ARCH_TA7		TA7			187
 nova			SA1100_NOVA		NOVA			188
 hmk			ARCH_HMK		HMK			189
-karo			ARCH_KARO		KARO			190
 fester			SA1100_FESTER		FESTER			191
 gpi			ARCH_GPI		GPI			192
 smdk2410		ARCH_SMDK2410		SMDK2410		193
diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h
index d995351..0f97820 100644
--- a/drivers/usb/host/isp1362.h
+++ b/drivers/usb/host/isp1362.h
@@ -8,29 +8,7 @@
 /*
  * Platform specific compile time options
  */
-#if defined(CONFIG_ARCH_KARO)
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/karo.h>
-
-#define USE_32BIT		1
-
-
-/* These options are mutually eclusive */
-#define USE_PLATFORM_DELAY	1
-#define USE_NDELAY		0
-/*
- * MAX_ROOT_PORTS: Number of downstream ports
- *
- * The chip has two USB ports, one of which can be configured as
- * an USB device port, so the value of this constant is implementation
- * specific.
- */
-#define MAX_ROOT_PORTS		2
-#define DUMMY_DELAY_ACCESS do {} while (0)
-
-/* insert platform specific definitions for other machines here */
-#elif defined(CONFIG_BLACKFIN)
+#if defined(CONFIG_BLACKFIN)
 
 #include <linux/io.h>
 #define USE_32BIT		0
-- 
1.7.0.4

[PATCH 2/3] usb/{gadget,host}: Remove dead CONFIG_CPU_PXA27x

[Eric Miao]

On Wed, Jul 14, 2010 at 7:32 PM, Christian Dietrich
<qy03fugy@stud.informatik.uni-erlangen.de> wrote:
> CONFIG_CPU_PXA27x doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
> ---
> ?drivers/usb/gadget/pxa27x_udc.c | ? 16 ----------------
> ?drivers/usb/host/ohci-pxa27x.c ?| ? ?8 --------
> ?2 files changed, 0 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
> index 85b0d89..73783f5 100644
> --- a/drivers/usb/gadget/pxa27x_udc.c
> +++ b/drivers/usb/gadget/pxa27x_udc.c
> @@ -2561,12 +2561,6 @@ static void pxa_udc_shutdown(struct platform_device *_dev)
> ? ? ? ? ? ? ? ?udc_disable(udc);
> ?}
>
> -#ifdef CONFIG_CPU_PXA27x

This should be CONFIG_PXA27x, I'll prepare a patch on this.

[PATCH 3/3] usb/host || arch/arm: Remove dead CONFIG_ARCH_KARO

[Mike Frysinger]

On Wed, Jul 14, 2010 at 07:32, Christian Dietrich wrote:
> CONFIG_ARCH_KARO doesn't exist in Kconfig and is never defined anywhere
> else, therefore removing all references for it from the source code.
>
> --- a/arch/arm/tools/mach-types
> +++ b/arch/arm/tools/mach-types
> @@ -204,7 +204,6 @@ omaha ? ? ? ? ? ? ? ? ? ? ? ARCH_OMAHA ? ? ? ? ? ? ?OMAHA ? ? ? ? ? ? ? ? ? 186
> ?ta7 ? ? ? ? ? ? ? ? ? ?ARCH_TA7 ? ? ? ? ? ? ? ?TA7 ? ? ? ? ? ? ? ? ? ? 187
> ?nova ? ? ? ? ? ? ? ? ? SA1100_NOVA ? ? ? ? ? ? NOVA ? ? ? ? ? ? ? ? ? ?188
> ?hmk ? ? ? ? ? ? ? ? ? ?ARCH_HMK ? ? ? ? ? ? ? ?HMK ? ? ? ? ? ? ? ? ? ? 189
> -karo ? ? ? ? ? ? ? ? ? ARCH_KARO ? ? ? ? ? ? ? KARO ? ? ? ? ? ? ? ? ? ?190
> ?fester ? ? ? ? ? ? ? ? SA1100_FESTER ? ? ? ? ? FESTER ? ? ? ? ? ? ? ? ?191
> ?gpi ? ? ? ? ? ? ? ? ? ?ARCH_GPI ? ? ? ? ? ? ? ?GPI ? ? ? ? ? ? ? ? ? ? 192
> ?smdk2410 ? ? ? ? ? ? ? ARCH_SMDK2410 ? ? ? ? ? SMDK2410 ? ? ? ? ? ? ? ?193

i dont think you should be modifying the arm registry.  there are
probably a lot of boards listed here that you wont find referenced in
the tree, but this is by design.
-mike

[PATCH 3/3] usb/host || arch/arm: Remove dead CONFIG_ARCH_KARO

[Ryan Mallon]

On 07/14/2010 11:32 PM, Christian Dietrich wrote:
> CONFIG_ARCH_KARO doesn't exist in Kconfig and is never defined anywhere
> else, therefore removing all references for it from the source code.
> 
> Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
> ---
>  arch/arm/tools/mach-types  |    1 -
>  drivers/usb/host/isp1362.h |   24 +-----------------------
>  2 files changed, 1 insertions(+), 24 deletions(-)
> 
> diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
> index 8f10d24..3d86318 100644
> --- a/arch/arm/tools/mach-types
> +++ b/arch/arm/tools/mach-types
> @@ -204,7 +204,6 @@ omaha			ARCH_OMAHA		OMAHA			186
>  ta7			ARCH_TA7		TA7			187
>  nova			SA1100_NOVA		NOVA			188
>  hmk			ARCH_HMK		HMK			189
> -karo			ARCH_KARO		KARO			190
>  fester			SA1100_FESTER		FESTER			191
>  gpi			ARCH_GPI		GPI			192
>  smdk2410		ARCH_SMDK2410		SMDK2410		193

Don't post patches for the mach-types file. It is generated
automatically from here the ARM machine registry:
http://www.arm.linux.org.uk/developer/machines/.

It is perfectly fine to have a machine type defined in mach-types which
is not supported in the mainline kernel. This allows developers to have
a stable machine id even if their board is not yet supported in the
mainline kernel.

> diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h
> index d995351..0f97820 100644
> --- a/drivers/usb/host/isp1362.h
> +++ b/drivers/usb/host/isp1362.h
> @@ -8,29 +8,7 @@
>  /*
>   * Platform specific compile time options
>   */
> -#if defined(CONFIG_ARCH_KARO)
> -#include <asm/arch/hardware.h>
> -#include <asm/arch/pxa-regs.h>
> -#include <asm/arch/karo.h>
> -
> -#define USE_32BIT		1
> -
> -
> -/* These options are mutually eclusive */
> -#define USE_PLATFORM_DELAY	1
> -#define USE_NDELAY		0
> -/*
> - * MAX_ROOT_PORTS: Number of downstream ports
> - *
> - * The chip has two USB ports, one of which can be configured as
> - * an USB device port, so the value of this constant is implementation
> - * specific.
> - */
> -#define MAX_ROOT_PORTS		2
> -#define DUMMY_DELAY_ACCESS do {} while (0)
> -
> -/* insert platform specific definitions for other machines here */
> -#elif defined(CONFIG_BLACKFIN)
> +#if defined(CONFIG_BLACKFIN)
>  
>  #include <linux/io.h>
>  #define USE_32BIT		0

The rest of this patch looks fine. It appears the Karo stuff was added
when the ISP1362 driver was first committed. Probably some left over
development stuff that got missed.

~Ryan

-- 
Bluewater Systems Ltd - ARM Technology Solution Centre

Ryan Mallon         		5 Amuri Park, 404 Barbadoes St
ryan at bluewatersys.com         	PO Box 13 889, Christchurch 8013
http://www.bluewatersys.com	New Zealand
Phone: +64 3 3779127		Freecall: Australia 1800 148 751
Fax:   +64 3 3779135			  USA 1800 261 2934

[PATCH 2/3] usb/{gadget,host}: Remove dead CONFIG_CPU_PXA27x

[Eric Miao]

On Wed, Jul 14, 2010 at 8:30 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> On Wed, Jul 14, 2010 at 7:32 PM, Christian Dietrich
> <qy03fugy@stud.informatik.uni-erlangen.de> wrote:
>> CONFIG_CPU_PXA27x doesn't exist in Kconfig, therefore removing all
>> references for it from the source code.
>>
>> Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
>> ---
>> ?drivers/usb/gadget/pxa27x_udc.c | ? 16 ----------------
>> ?drivers/usb/host/ohci-pxa27x.c ?| ? ?8 --------
>> ?2 files changed, 0 insertions(+), 24 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
>> index 85b0d89..73783f5 100644
>> --- a/drivers/usb/gadget/pxa27x_udc.c
>> +++ b/drivers/usb/gadget/pxa27x_udc.c
>> @@ -2561,12 +2561,6 @@ static void pxa_udc_shutdown(struct platform_device *_dev)
>> ? ? ? ? ? ? ? ?udc_disable(udc);
>> ?}
>>
>> -#ifdef CONFIG_CPU_PXA27x
>
> This should be CONFIG_PXA27x, I'll prepare a patch on this.
>

    [ARM] pxa: fix incorrect CONFIG_CPU_PXA27x to CONFIG_PXA27x

    Reported-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
    Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 85b0d89..9807624 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -2561,7 +2561,7 @@ static void pxa_udc_shutdown(struct platform_device *_dev)
 		udc_disable(udc);
 }

-#ifdef CONFIG_CPU_PXA27x
+#ifdef CONFIG_PXA27x
 extern void pxa27x_clear_otgph(void);
 #else
 #define pxa27x_clear_otgph()   do {} while (0)
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index a18debd..4181638 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -203,7 +203,7 @@ static inline void pxa27x_reset_hc(struct pxa27x_ohci *ohci)
 	__raw_writel(uhchr & ~UHCHR_FHR, ohci->mmio_base + UHCHR);
 }

-#ifdef CONFIG_CPU_PXA27x
+#ifdef CONFIG_PXA27x
 extern void pxa27x_clear_otgph(void);
 #else
 #define pxa27x_clear_otgph()	do {} while (0)

[PATCH] usb/host: Remove dead CONFIG_ARCH_KARO

[Christian Dietrich]

CONFIG_ARCH_KARO doesn't exist in Kconfig and is never defined anywhere
else, therefore removing all references for it from the source code.

Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
---
 drivers/usb/host/isp1362.h |   24 +-----------------------
 1 files changed, 1 insertions(+), 23 deletions(-)

diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h
index d995351..0f97820 100644
--- a/drivers/usb/host/isp1362.h
+++ b/drivers/usb/host/isp1362.h
@@ -8,29 +8,7 @@
 /*
  * Platform specific compile time options
  */
-#if defined(CONFIG_ARCH_KARO)
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/karo.h>
-
-#define USE_32BIT              1
-
-
-/* These options are mutually eclusive */
-#define USE_PLATFORM_DELAY    1
-#define USE_NDELAY             0
-/*
- * MAX_ROOT_PORTS: Number of downstream ports
- *
- * The chip has two USB ports, one of which can be configured as
- * an USB device port, so the value of this constant is implementation
- * specific.
- */
-#define MAX_ROOT_PORTS         2
-#define DUMMY_DELAY_ACCESS do {} while (0)
-
-/* insert platform specific definitions for other machines here */
-#elif defined(CONFIG_BLACKFIN)
+#if defined(CONFIG_BLACKFIN)
 
 #include <linux/io.h>
 #define USE_32BIT              0
-- 
1.7.0.4

[PATCH] usb/host: Remove dead CONFIG_ARCH_KARO

[Ryan Mallon]

On 07/20/2010 07:08 PM, Christian Dietrich wrote:
> 
> CONFIG_ARCH_KARO doesn't exist in Kconfig and is never defined anywhere
> else, therefore removing all references for it from the source code.
> 
> Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>

Unless someone has a reason why the support needs to stay:

Acked-by: Ryan Mallon <ryan@bluewatersys.com>

> ---
>  drivers/usb/host/isp1362.h |   24 +-----------------------
>  1 files changed, 1 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h
> index d995351..0f97820 100644
> --- a/drivers/usb/host/isp1362.h
> +++ b/drivers/usb/host/isp1362.h
> @@ -8,29 +8,7 @@
>  /*
>   * Platform specific compile time options
>   */
> -#if defined(CONFIG_ARCH_KARO)
> -#include <asm/arch/hardware.h>
> -#include <asm/arch/pxa-regs.h>
> -#include <asm/arch/karo.h>
> -
> -#define USE_32BIT              1
> -
> -
> -/* These options are mutually eclusive */
> -#define USE_PLATFORM_DELAY    1
> -#define USE_NDELAY             0
> -/*
> - * MAX_ROOT_PORTS: Number of downstream ports
> - *
> - * The chip has two USB ports, one of which can be configured as
> - * an USB device port, so the value of this constant is implementation
> - * specific.
> - */
> -#define MAX_ROOT_PORTS         2
> -#define DUMMY_DELAY_ACCESS do {} while (0)
> -
> -/* insert platform specific definitions for other machines here */
> -#elif defined(CONFIG_BLACKFIN)
> +#if defined(CONFIG_BLACKFIN)
>  
>  #include <linux/io.h>
>  #define USE_32BIT              0


-- 
Bluewater Systems Ltd - ARM Technology Solution Centre

Ryan Mallon         		5 Amuri Park, 404 Barbadoes St
ryan at bluewatersys.com         	PO Box 13 889, Christchurch 8013
http://www.bluewatersys.com	New Zealand
Phone: +64 3 3779127		Freecall: Australia 1800 148 751
Fax:   +64 3 3779135			  USA 1800 261 2934