Fwd: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?

Fwd: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?

[Kumar Gala]

Begin forwarded message:

> From: "Thomas S." <thomas@schnuerer-online.de>
> Date: August 8, 2005 4:48:03 PM CDT
> To: <linux-kernel@vger.kernel.org>
> Subject: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?
>
>
> Hello,
>
> Im using Kernel PPC on a MPC5200 board and try to use the onChip  
> USB. In
> file /drivers/usb/host/ohci-ppc-soc.c a file <asm/usb.h> is included
> which seems to be missing. I cant find it anywhere , any ideas ?
>
> Thomas
>
>
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux- 
> kernel"
> in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>

Re: Fwd: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?

[John Otken]

Google found it for me.  It is in my "Support 440EP
On-Chip OHCI USB Host Controller" patch:

http://patchwork.ozlabs.org/linuxppc/patch?id=1965


diff -uprN a/include/asm-ppc/usb.h b/include/asm-ppc/usb.h
--- a/include/asm-ppc/usb.h	1969-12-31 17:00:00.000000000 -0700
+++ b/include/asm-ppc/usb.h	2005-08-05 06:13:58.000000000 -0500
@@ -0,0 +1,13 @@
+/*
+ * ppc/usb.h:
+ *
+ */
+#ifndef _PPC_USB_H
+#define _PPC_USB_H
+
+struct usb_hcd_platform_data {
+	int (*start) (struct platform_device *pdev);
+	void (*stop) (struct platform_device *pdev);
+};
+
+#endif /* !(_PPC_USB_H) */


Kumar Gala wrote:
> 
> 
> Begin forwarded message:
> 
>> From: "Thomas S." <thomas@schnuerer-online.de>
>> Date: August 8, 2005 4:48:03 PM CDT
>> To: <linux-kernel@vger.kernel.org>
>> Subject: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?
>>
>>
>> Hello,
>>
>> Im using Kernel PPC on a MPC5200 board and try to use the onChip  USB. In
>> file /drivers/usb/host/ohci-ppc-soc.c a file <asm/usb.h> is included
>> which seems to be missing. I cant find it anywhere , any ideas ?
>>
>> Thomas
>>
>>
>>
>>
>> -
>> To unsubscribe from this list: send the line "unsubscribe linux- kernel"
>> in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/
>>
> 
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
> 

Re: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?

[Kumar Gala]

Why are we bothering with asm-ppc/usb.h anyways?

The structure defn only appears to be used once.  If this is true,  
why not just define it in the .c file.

- kumar

On Aug 9, 2005, at 7:19 AM, John Otken wrote:

> Google found it for me.  It is in my "Support 440EP
> On-Chip OHCI USB Host Controller" patch:
>
> http://patchwork.ozlabs.org/linuxppc/patch?id=1965
>
>
> diff -uprN a/include/asm-ppc/usb.h b/include/asm-ppc/usb.h
> --- a/include/asm-ppc/usb.h    1969-12-31 17:00:00.000000000 -0700
> +++ b/include/asm-ppc/usb.h    2005-08-05 06:13:58.000000000 -0500
> @@ -0,0 +1,13 @@
> +/*
> + * ppc/usb.h:
> + *
> + */
> +#ifndef _PPC_USB_H
> +#define _PPC_USB_H
> +
> +struct usb_hcd_platform_data {
> +    int (*start) (struct platform_device *pdev);
> +    void (*stop) (struct platform_device *pdev);
> +};
> +
> +#endif /* !(_PPC_USB_H) */
>
>
> Kumar Gala wrote:
>
>>
>>
>> Begin forwarded message:
>>
>>
>>> From: "Thomas S." <thomas@schnuerer-online.de>
>>> Date: August 8, 2005 4:48:03 PM CDT
>>> To: <linux-kernel@vger.kernel.org>
>>> Subject: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?
>>>
>>>
>>> Hello,
>>>
>>> Im using Kernel PPC on a MPC5200 board and try to use the onChip   
>>> USB. In
>>> file /drivers/usb/host/ohci-ppc-soc.c a file <asm/usb.h> is included
>>> which seems to be missing. I cant find it anywhere , any ideas ?
>>>
>>> Thomas
>>>
>>>
>>>
>>>
>>> -
>>> To unsubscribe from this list: send the line "unsubscribe linux-  
>>> kernel"
>>> in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>> Please read the FAQ at  http://www.tux.org/lkml/
>>>
>>>
>>
>> _______________________________________________
>> Linuxppc-embedded mailing list
>> Linuxppc-embedded@ozlabs.org
>> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>>
>

Re: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?

[Eugene Surovegin]

On Tue, Aug 09, 2005 at 09:50:50AM -0500, Kumar Gala wrote:
> Why are we bothering with asm-ppc/usb.h anyways?
> 
> The structure defn only appears to be used once.  If this is true,  
> why not just define it in the .c file.
> 

Yeah, I think we should stop that unneeded creation of include files 
which are used only once.

For some strange reason people like doing this, I wonder why. Maybe 
they were taught this "style" in their CS classes :)?

-- 
Eugene

Re: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?

[John Otken]

My patch to add on-chip OHCI support to the 440EP adds
an asm/usb.h reference to 4xx/ibm440ep.c.  Thomas may
also require it for his MPC5200 mods.

I don't like small include files either.  Perhaps there
is an existing file where struct usb_hcd_platform_data
can live.  Any suggestions?

John


Kumar Gala wrote:
> Why are we bothering with asm-ppc/usb.h anyways?
> 
> The structure defn only appears to be used once.  If this is true,  why 
> not just define it in the .c file.
> 
> - kumar
> 
> On Aug 9, 2005, at 7:19 AM, John Otken wrote:
> 
>> Google found it for me.  It is in my "Support 440EP
>> On-Chip OHCI USB Host Controller" patch:
>>
>> http://patchwork.ozlabs.org/linuxppc/patch?id=1965
>>
>>
>> diff -uprN a/include/asm-ppc/usb.h b/include/asm-ppc/usb.h
>> --- a/include/asm-ppc/usb.h    1969-12-31 17:00:00.000000000 -0700
>> +++ b/include/asm-ppc/usb.h    2005-08-05 06:13:58.000000000 -0500
>> @@ -0,0 +1,13 @@
>> +/*
>> + * ppc/usb.h:
>> + *
>> + */
>> +#ifndef _PPC_USB_H
>> +#define _PPC_USB_H
>> +
>> +struct usb_hcd_platform_data {
>> +    int (*start) (struct platform_device *pdev);
>> +    void (*stop) (struct platform_device *pdev);
>> +};
>> +
>> +#endif /* !(_PPC_USB_H) */
>>
>>
>> Kumar Gala wrote:
>>
>>>
>>>
>>> Begin forwarded message:
>>>
>>>
>>>> From: "Thomas S." <thomas@schnuerer-online.de>
>>>> Date: August 8, 2005 4:48:03 PM CDT
>>>> To: <linux-kernel@vger.kernel.org>
>>>> Subject: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?
>>>>
>>>>
>>>> Hello,
>>>>
>>>> Im using Kernel PPC on a MPC5200 board and try to use the onChip   
>>>> USB. In
>>>> file /drivers/usb/host/ohci-ppc-soc.c a file <asm/usb.h> is included
>>>> which seems to be missing. I cant find it anywhere , any ideas ?
>>>>
>>>> Thomas
>>>>
>>>>
>>>>
>>>>
>>>> -
>>>> To unsubscribe from this list: send the line "unsubscribe linux-  
>>>> kernel"
>>>> in
>>>> the body of a message to majordomo@vger.kernel.org
>>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>>> Please read the FAQ at  http://www.tux.org/lkml/
>>>>
>>>>
>>>
>>> _______________________________________________
>>> Linuxppc-embedded mailing list
>>> Linuxppc-embedded@ozlabs.org
>>> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>>>
>>
> 
> 

Re: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?

[Kumar Gala]

Well for the 5200 Thomas should be using include/linux/fsl_devices.h

If/when 4xx coverts over to platform devices we could have an  
equivalent include file if truly needed.

- kumar

On Aug 9, 2005, at 11:58 AM, John Otken wrote:

> My patch to add on-chip OHCI support to the 440EP adds
> an asm/usb.h reference to 4xx/ibm440ep.c.  Thomas may
> also require it for his MPC5200 mods.
>
> I don't like small include files either.  Perhaps there
> is an existing file where struct usb_hcd_platform_data
> can live.  Any suggestions?
>
> John
>
>
> Kumar Gala wrote:
>
>> Why are we bothering with asm-ppc/usb.h anyways?
>>
>> The structure defn only appears to be used once.  If this is  
>> true,  why
>> not just define it in the .c file.
>>
>> - kumar
>>
>> On Aug 9, 2005, at 7:19 AM, John Otken wrote:
>>
>>
>>> Google found it for me.  It is in my "Support 440EP
>>> On-Chip OHCI USB Host Controller" patch:
>>>
>>> http://patchwork.ozlabs.org/linuxppc/patch?id=1965
>>>
>>>
>>> diff -uprN a/include/asm-ppc/usb.h b/include/asm-ppc/usb.h
>>> --- a/include/asm-ppc/usb.h    1969-12-31 17:00:00.000000000 -0700
>>> +++ b/include/asm-ppc/usb.h    2005-08-05 06:13:58.000000000 -0500
>>> @@ -0,0 +1,13 @@
>>> +/*
>>> + * ppc/usb.h:
>>> + *
>>> + */
>>> +#ifndef _PPC_USB_H
>>> +#define _PPC_USB_H
>>> +
>>> +struct usb_hcd_platform_data {
>>> +    int (*start) (struct platform_device *pdev);
>>> +    void (*stop) (struct platform_device *pdev);
>>> +};
>>> +
>>> +#endif /* !(_PPC_USB_H) */
>>>
>>>
>>> Kumar Gala wrote:
>>>
>>>
>>>>
>>>>
>>>> Begin forwarded message:
>>>>
>>>>
>>>>
>>>>> From: "Thomas S." <thomas@schnuerer-online.de>
>>>>> Date: August 8, 2005 4:48:03 PM CDT
>>>>> To: <linux-kernel@vger.kernel.org>
>>>>> Subject: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?
>>>>>
>>>>>
>>>>> Hello,
>>>>>
>>>>> Im using Kernel PPC on a MPC5200 board and try to use the onChip
>>>>> USB. In
>>>>> file /drivers/usb/host/ohci-ppc-soc.c a file <asm/usb.h> is  
>>>>> included
>>>>> which seems to be missing. I cant find it anywhere , any ideas ?
>>>>>
>>>>> Thomas
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> -
>>>>> To unsubscribe from this list: send the line "unsubscribe linux-
>>>>> kernel"
>>>>> in
>>>>> the body of a message to majordomo@vger.kernel.org
>>>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>>>> Please read the FAQ at  http://www.tux.org/lkml/
>>>>>
>>>>>
>>>>>
>>>>
>>>> _______________________________________________
>>>> Linuxppc-embedded mailing list
>>>> Linuxppc-embedded@ozlabs.org
>>>> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>>>>
>>>>
>>>
>>>
>>
>>
>

Re: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?

[Thomas S.]

Kumar,

thanks for the Info, that helps. Do you know if in this kernel Version 
the MPC5200 USB Bug is already handled?

I refer to errata document MPC5200E.pdf (I think rev. 06/2005) in which 
its stated that the frame_no and pad1 words are swapped in the 
processors OHCI Area. I saw in some earlier 2.4 kernel that in 
/drivers/usb/host/ohci.h the members frame_no and pad1 of struct 
ohci_hcca were swapped. maybe thats not necessary anymore ?

Im using this driver to support our embedded system modules equipped 
with the 5200 (see the EM1 board on www.men.de for specs).

regards,
Thomas


Kumar Gala wrote:
> Well for the 5200 Thomas should be using include/linux/fsl_devices.h
> 
> If/when 4xx coverts over to platform devices we could have an  
> equivalent include file if truly needed.
> 
> - kumar
> 
> On Aug 9, 2005, at 11:58 AM, John Otken wrote:
> 
>> My patch to add on-chip OHCI support to the 440EP adds
>> an asm/usb.h reference to 4xx/ibm440ep.c.  Thomas may
>> also require it for his MPC5200 mods.
>>
>> I don't like small include files either.  Perhaps there
>> is an existing file where struct usb_hcd_platform_data
>> can live.  Any suggestions?
>>
>> John
>>
>>
>> Kumar Gala wrote:
>>
>>> Why are we bothering with asm-ppc/usb.h anyways?
>>>
>>> The structure defn only appears to be used once.  If this is  true,  why
>>> not just define it in the .c file.
>>>
>>> - kumar
>>>
>>> On Aug 9, 2005, at 7:19 AM, John Otken wrote:
>>>
>>>
>>>> Google found it for me.  It is in my "Support 440EP
>>>> On-Chip OHCI USB Host Controller" patch:
>>>>
>>>> http://patchwork.ozlabs.org/linuxppc/patch?id=1965
>>>>
>>>>
>>>> diff -uprN a/include/asm-ppc/usb.h b/include/asm-ppc/usb.h
>>>> --- a/include/asm-ppc/usb.h    1969-12-31 17:00:00.000000000 -0700
>>>> +++ b/include/asm-ppc/usb.h    2005-08-05 06:13:58.000000000 -0500
>>>> @@ -0,0 +1,13 @@
>>>> +/*
>>>> + * ppc/usb.h:
>>>> + *
>>>> + */
>>>> +#ifndef _PPC_USB_H
>>>> +#define _PPC_USB_H
>>>> +
>>>> +struct usb_hcd_platform_data {
>>>> +    int (*start) (struct platform_device *pdev);
>>>> +    void (*stop) (struct platform_device *pdev);
>>>> +};
>>>> +
>>>> +#endif /* !(_PPC_USB_H) */
>>>>
>>>>
>>>> Kumar Gala wrote:
>>>>
>>>>
>>>>>
>>>>>
>>>>> Begin forwarded message:
>>>>>
>>>>>
>>>>>
>>>>>> From: "Thomas S." <thomas@schnuerer-online.de>
>>>>>> Date: August 8, 2005 4:48:03 PM CDT
>>>>>> To: <linux-kernel@vger.kernel.org>
>>>>>> Subject: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?
>>>>>>
>>>>>>
>>>>>> Hello,
>>>>>>
>>>>>> Im using Kernel PPC on a MPC5200 board and try to use the onChip
>>>>>> USB. In
>>>>>> file /drivers/usb/host/ohci-ppc-soc.c a file <asm/usb.h> is  included
>>>>>> which seems to be missing. I cant find it anywhere , any ideas ?
>>>>>>
>>>>>> Thomas
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> -
>>>>>> To unsubscribe from this list: send the line "unsubscribe linux-
>>>>>> kernel"
>>>>>> in
>>>>>> the body of a message to majordomo@vger.kernel.org
>>>>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>>>>> Please read the FAQ at  http://www.tux.org/lkml/
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>> _______________________________________________
>>>>> Linuxppc-embedded mailing list
>>>>> Linuxppc-embedded@ozlabs.org
>>>>> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>>>>>
>>>>>
>>>>
>>>>
>>>
>>>
>>
> 
> 

Re: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?

[Kumar Gala]

On Aug 10, 2005, at 2:44 PM, Thomas S. wrote:

> Kumar,
>
> thanks for the Info, that helps. Do you know if in this kernel Version
> the MPC5200 USB Bug is already handled?

I really dont.  I done next to nothing with the 5200.

> I refer to errata document MPC5200E.pdf (I think rev. 06/2005) in  
> which
> its stated that the frame_no and pad1 words are swapped in the
> processors OHCI Area. I saw in some earlier 2.4 kernel that in
> /drivers/usb/host/ohci.h the members frame_no and pad1 of struct
> ohci_hcca were swapped. maybe thats not necessary anymore ?
>
> Im using this driver to support our embedded system modules equipped
> with the 5200 (see the EM1 board on www.men.de for specs).
>
> regards,
> Thomas
>
>
> Kumar Gala wrote:
>
>> Well for the 5200 Thomas should be using include/linux/fsl_devices.h
>>
>> If/when 4xx coverts over to platform devices we could have an
>> equivalent include file if truly needed.
>>
>> - kumar
>>
>> On Aug 9, 2005, at 11:58 AM, John Otken wrote:
>>
>>
>>> My patch to add on-chip OHCI support to the 440EP adds
>>> an asm/usb.h reference to 4xx/ibm440ep.c.  Thomas may
>>> also require it for his MPC5200 mods.
>>>
>>> I don't like small include files either.  Perhaps there
>>> is an existing file where struct usb_hcd_platform_data
>>> can live.  Any suggestions?
>>>
>>> John
>>>
>>>
>>> Kumar Gala wrote:
>>>
>>>
>>>> Why are we bothering with asm-ppc/usb.h anyways?
>>>>
>>>> The structure defn only appears to be used once.  If this is  true,
>>>>
> why
>
>>>> not just define it in the .c file.
>>>>
>>>> - kumar
>>>>
>>>> On Aug 9, 2005, at 7:19 AM, John Otken wrote:
>>>>
>>>>
>>>>
>>>>> Google found it for me.  It is in my "Support 440EP
>>>>> On-Chip OHCI USB Host Controller" patch:
>>>>>
>>>>> http://patchwork.ozlabs.org/linuxppc/patch?id=1965
>>>>>
>>>>>
>>>>> diff -uprN a/include/asm-ppc/usb.h b/include/asm-ppc/usb.h
>>>>> --- a/include/asm-ppc/usb.h    1969-12-31 17:00:00.000000000 -0700
>>>>> +++ b/include/asm-ppc/usb.h    2005-08-05 06:13:58.000000000 -0500
>>>>> @@ -0,0 +1,13 @@
>>>>> +/*
>>>>> + * ppc/usb.h:
>>>>> + *
>>>>> + */
>>>>> +#ifndef _PPC_USB_H
>>>>> +#define _PPC_USB_H
>>>>> +
>>>>> +struct usb_hcd_platform_data {
>>>>> +    int (*start) (struct platform_device *pdev);
>>>>> +    void (*stop) (struct platform_device *pdev);
>>>>> +};
>>>>> +
>>>>> +#endif /* !(_PPC_USB_H) */
>>>>>
>>>>>
>>>>> Kumar Gala wrote:
>>>>>
>>>>>
>>>>>
>>>>>>
>>>>>>
>>>>>> Begin forwarded message:
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>>> From: "Thomas S." <thomas@schnuerer-online.de>
>>>>>>> Date: August 8, 2005 4:48:03 PM CDT
>>>>>>> To: <linux-kernel@vger.kernel.org>
>>>>>>> Subject: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?
>>>>>>>
>>>>>>>
>>>>>>> Hello,
>>>>>>>
>>>>>>> Im using Kernel PPC on a MPC5200 board and try to use the onChip
>>>>>>> USB. In
>>>>>>> file /drivers/usb/host/ohci-ppc-soc.c a file <asm/usb.h> is
>>>>>>>
> included
>
>>>>>>> which seems to be missing. I cant find it anywhere , any ideas ?
>>>>>>>
>>>>>>> Thomas
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> -
>>>>>>> To unsubscribe from this list: send the line "unsubscribe linux-
>>>>>>> kernel"
>>>>>>> in
>>>>>>> the body of a message to majordomo@vger.kernel.org
>>>>>>> More majordomo info at
>>>>>>>
> http://vger.kernel.org/majordomo-info.html
>
>>>>>>> Please read the FAQ at  http://www.tux.org/lkml/
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>> _______________________________________________
>>>>>> Linuxppc-embedded mailing list
>>>>>> Linuxppc-embedded@ozlabs.org
>>>>>> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>>
>>>>
>>>>
>>>>
>>>
>>>
>>
>>
>

Re: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?

[Dale Farnsworth]

On Wed, Aug 10, 2005 at 07:44:50PM +0000, Thomas S. wrote:
> thanks for the Info, that helps. Do you know if in this kernel Version 
> the MPC5200 USB Bug is already handled?
> 
> I refer to errata document MPC5200E.pdf (I think rev. 06/2005) in which 
> its stated that the frame_no and pad1 words are swapped in the 
> processors OHCI Area. I saw in some earlier 2.4 kernel that in 
> /drivers/usb/host/ohci.h the members frame_no and pad1 of struct 
> ohci_hcca were swapped. maybe thats not necessary anymore ?
> 
> Im using this driver to support our embedded system modules equipped 
> with the 5200 (see the EM1 board on www.men.de for specs).

Yes, the swapped frame_no issue is handled in the 2.6 MPC5200 usb
driver.

-Dale

Re: [linuxppc] 2.6.12-3 header <asm/usb.h> missing ?

[Dale Farnsworth]

On Tue, Aug 09, 2005 at 02:50:50PM +0000, Kumar Gala wrote:
> Why are we bothering with asm-ppc/usb.h anyways?
> 
> The structure defn only appears to be used once.  If this is true,  
> why not just define it in the .c file.
> 
> - kumar

I previously added asm-ppc/usb.h.

It provides platform-specific callback functions for when the usb HC is
probed and removed.  I attempted to use them for power management on the
ibmstb4 (redwood5) platform, but that code was bogus so I retracted it.

Also, I saw that there are currently several (non-ppc) usb HC drivers
that differ only in platform-specific code at probe and remove time,
so I wanted to avoid that kind of code duplication in the ppc world.

The callback functions are unused today though.  I think we should
remove them.  We can always add them back if they are needed later.

No need to add asm-ppc/usb.h

Instead, apply the following patch.  I'll submit it to linux-usb-devel
tomorrow if no one here complains.

-Dale

This patch removes the reference to asm/usb.h and to the
usb_hcd_platform_data structure it contains.  This structure
is currently unused.  If we decide it's needed later, we can
add it back.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>

--- linux-2.6/drivers/usb/host/ohci-ppc-soc.c.old	2005-08-09 10:46:37.000000000 -0700
+++ linux-2.6/drivers/usb/host/ohci-ppc-soc.c	2005-08-09 11:03:44.000000000 -0700
@@ -14,8 +14,6 @@
  * This file is licenced under the GPL.
  */
 
-#include <asm/usb.h>
-
 /* configure so an HC device and id are always provided */
 /* always called with process context; sleeping is OK */
 
@@ -23,9 +21,7 @@
  * usb_hcd_ppc_soc_probe - initialize On-Chip HCDs
  * Context: !in_interrupt()
  *
- * Allocates basic resources for this USB host controller, and
- * then invokes the start() method for the HCD associated with it
- * through the hotplug entry's driver_data.
+ * Allocates basic resources for this USB host controller.
  *
  * Store this function in the HCD's struct pci_driver as probe().
  */
@@ -37,7 +33,6 @@
 	struct ohci_hcd	*ohci;
 	struct resource *res;
 	int irq;
-	struct usb_hcd_platform_data *pd = pdev->dev.platform_data;
 
 	pr_debug("initializing PPC-SOC USB Controller\n");
 
@@ -73,9 +68,6 @@
 		goto err2;
 	}
 
-	if (pd->start && (retval = pd->start(pdev)))
-		goto err3;
-
 	ohci = hcd_to_ohci(hcd);
 	ohci->flags |= OHCI_BIG_ENDIAN;
 	ohci_hcd_init(ohci);
@@ -85,9 +77,7 @@
 		return retval;
 
 	pr_debug("Removing PPC-SOC USB Controller\n");
-	if (pd && pd->stop)
-		pd->stop(pdev);
- err3:
+
 	iounmap(hcd->regs);
  err2:
 	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
@@ -105,21 +95,17 @@
  * @pdev: USB Host Controller being removed
  * Context: !in_interrupt()
  *
- * Reverses the effect of usb_hcd_ppc_soc_probe(), first invoking
- * the HCD's stop() method.  It is always called from a thread
+ * Reverses the effect of usb_hcd_ppc_soc_probe().
+ * It is always called from a thread
  * context, normally "rmmod", "apmd", or something similar.
  *
  */
 static void usb_hcd_ppc_soc_remove(struct usb_hcd *hcd,
 		struct platform_device *pdev)
 {
-	struct usb_hcd_platform_data *pd = pdev->dev.platform_data;
-
 	usb_remove_hcd(hcd);
 
 	pr_debug("stopping PPC-SOC USB Controller\n");
-	if (pd && pd->stop)
-		pd->stop(pdev);
 
 	iounmap(hcd->regs);
 	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);