On Wed, Sep 14, 2011 at 02:57:12PM +0100, Dave Martin wrote:
> This patch just replaces the (presumably historical) CONFIG_OF_PPC
>
> Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx>
> Acked-by: Pawel Moll <pawel.moll@xxxxxxx>
> ---
> drivers/usb/host/isp1760-if.c | 10 ++++++----
> 1 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
> index 7ee3005..69ee32c 100644
> --- a/drivers/usb/host/isp1760-if.c
> +++ b/drivers/usb/host/isp1760-if.c
> @@ -17,16 +17,18 @@
>
> #include "isp1760-hcd.h"
>
> -#ifdef CONFIG_PPC_OF
> +#ifdef CONFIG_OF
This #ifdef can just be dropped entirely. linux/of*.h is always safe to
include now.
> #include <linux/of.h>
> #include <linux/of_platform.h>
> +#include <linux/of_address.h>
> +#include <linux/of_irq.h>
> #endif
>
> #ifdef CONFIG_PCI
> #include <linux/pci.h>
> #endif
>
> -#ifdef CONFIG_PPC_OF
> +#ifdef CONFIG_OF
> static int of_isp1760_probe(struct platform_device *dev)
> {
> struct usb_hcd *hcd;
> @@ -396,7 +398,7 @@ static int __init isp1760_init(void)
> ret = platform_driver_register(&isp1760_plat_driver);
> if (!ret)
> any_ret = 0;
> -#ifdef CONFIG_PPC_OF
> +#ifdef CONFIG_OF
> ret = platform_driver_register(&isp1760_of_driver);
> if (!ret)
> any_ret = 0;
This should really be changed. It used to be that of_platform_driver
and platform_driver were different things, but that is no longer the
case. A single platform_driver should handle both the DT and non-DT
use cases.
That said, I don't have any objection to this patch being merged. I'd
just be happier if it was cleaned up properly.
g.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
