mirror of https://gitee.com/openkylin/linux.git
usb: exynos: do not include plat/usb-phy.h
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: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2871782ae1
commit
cccfc53626
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue