lkml.org 
[lkml]   [2013]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3] usb: exynos: do not include plat/usb-phy.h
    Date
    The definitions have moved to include/linux/usb/samsung-usb-phy.h,
    and plat/usb-phy.h is unavailable from drivers in a multiplatform
    configuration.

    Also fix up the plat/usb-phy.h header file to use the definitions
    from the new header instead of providing a separate copy.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Cc: linux-usb@vger.kernel.org
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Alan Stern <stern@rowland.harvard.edu>
    ---
    v3: rebase to usb-next (2871782ae1)

    v2: rebase whole series on top of arm-soc for testing

    diff --git a/arch/arm/mach-exynos/setup-usb-phy.c b/arch/arm/mach-exynos/setup-usb-phy.c
    index b81cc56..6af4066 100644
    --- a/arch/arm/mach-exynos/setup-usb-phy.c
    +++ b/arch/arm/mach-exynos/setup-usb-phy.c
    @@ -204,9 +204,9 @@ static int exynos4210_usb_phy1_exit(struct platform_device *pdev)

    int s5p_usb_phy_init(struct platform_device *pdev, int type)
    {
    - if (type == S5P_USB_PHY_DEVICE)
    + if (type == USB_PHY_TYPE_DEVICE)
    return exynos4210_usb_phy0_init(pdev);
    - else if (type == S5P_USB_PHY_HOST)
    + else if (type == USB_PHY_TYPE_HOST)
    return exynos4210_usb_phy1_init(pdev);

    return -EINVAL;
    @@ -214,9 +214,9 @@ int s5p_usb_phy_init(struct platform_device *pdev, int type)

    int s5p_usb_phy_exit(struct platform_device *pdev, int type)
    {
    - if (type == S5P_USB_PHY_DEVICE)
    + if (type == USB_PHY_TYPE_DEVICE)
    return exynos4210_usb_phy0_exit(pdev);
    - else if (type == S5P_USB_PHY_HOST)
    + else if (type == USB_PHY_TYPE_HOST)
    return exynos4210_usb_phy1_exit(pdev);

    return -EINVAL;
    diff --git a/arch/arm/mach-s3c64xx/setup-usb-phy.c b/arch/arm/mach-s3c64xx/setup-usb-phy.c
    index c8174d9..ca960bd 100644
    --- a/arch/arm/mach-s3c64xx/setup-usb-phy.c
    +++ b/arch/arm/mach-s3c64xx/setup-usb-phy.c
    @@ -76,7 +76,7 @@ static int s3c_usb_otgphy_exit(struct platform_device *pdev)

    int s5p_usb_phy_init(struct platform_device *pdev, int type)
    {
    - if (type == S5P_USB_PHY_DEVICE)
    + if (type == USB_PHY_TYPE_DEVICE)
    return s3c_usb_otgphy_init(pdev);

    return -EINVAL;
    @@ -84,7 +84,7 @@ int s5p_usb_phy_init(struct platform_device *pdev, int type)

    int s5p_usb_phy_exit(struct platform_device *pdev, int type)
    {
    - if (type == S5P_USB_PHY_DEVICE)
    + if (type == USB_PHY_TYPE_DEVICE)
    return s3c_usb_otgphy_exit(pdev);

    return -EINVAL;
    diff --git a/arch/arm/mach-s5pv210/setup-usb-phy.c b/arch/arm/mach-s5pv210/setup-usb-phy.c
    index 356a090..b2ee533 100644
    --- a/arch/arm/mach-s5pv210/setup-usb-phy.c
    +++ b/arch/arm/mach-s5pv210/setup-usb-phy.c
    @@ -80,7 +80,7 @@ static int s5pv210_usb_otgphy_exit(struct platform_device *pdev)

    int s5p_usb_phy_init(struct platform_device *pdev, int type)
    {
    - if (type == S5P_USB_PHY_DEVICE)
    + if (type == USB_PHY_TYPE_DEVICE)
    return s5pv210_usb_otgphy_init(pdev);

    return -EINVAL;
    @@ -88,7 +88,7 @@ int s5p_usb_phy_init(struct platform_device *pdev, int type)

    int s5p_usb_phy_exit(struct platform_device *pdev, int type)
    {
    - if (type == S5P_USB_PHY_DEVICE)
    + if (type == USB_PHY_TYPE_DEVICE)
    return s5pv210_usb_otgphy_exit(pdev);

    return -EINVAL;
    diff --git a/arch/arm/plat-samsung/include/plat/usb-phy.h b/arch/arm/plat-samsung/include/plat/usb-phy.h
    index 959bcdb..ab34dfa 100644
    --- a/arch/arm/plat-samsung/include/plat/usb-phy.h
    +++ b/arch/arm/plat-samsung/include/plat/usb-phy.h
    @@ -11,10 +11,7 @@
    #ifndef __PLAT_SAMSUNG_USB_PHY_H
    #define __PLAT_SAMSUNG_USB_PHY_H __FILE__

    -enum s5p_usb_phy_type {
    - S5P_USB_PHY_DEVICE,
    - S5P_USB_PHY_HOST,
    -};
    +#include <linux/usb/samsung_usb_phy.h>

    extern int s5p_usb_phy_init(struct platform_device *pdev, int type);
    extern int s5p_usb_phy_exit(struct platform_device *pdev, int type);
    diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
    index 580548a..6357752 100644
    --- a/drivers/usb/host/ehci-s5p.c
    +++ b/drivers/usb/host/ehci-s5p.c
    @@ -23,7 +23,6 @@
    #include <linux/platform_data/usb-ehci-s5p.h>
    #include <linux/usb/phy.h>
    #include <linux/usb/samsung_usb_phy.h>
    -#include <plat/usb-phy.h>
    #include <linux/usb.h>
    #include <linux/usb/hcd.h>
    #include <linux/usb/otg.h>
    diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
    index 509fa51..114583a 100644
    --- a/drivers/usb/host/ohci-exynos.c
    +++ b/drivers/usb/host/ohci-exynos.c
    @@ -17,7 +17,6 @@
    #include <linux/platform_data/usb-exynos.h>
    #include <linux/usb/phy.h>
    #include <linux/usb/samsung_usb_phy.h>
    -#include <plat/usb-phy.h>

    struct exynos_ohci_hcd {
    struct device *dev;

    \
     
     \ /
      Last update: 2013-04-11 23:41    [W:2.387 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site