Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cccfc536 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2871782a

arch/arm/mach-exynos/setup-usb-phy.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-s3c64xx/setup-usb-phy.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-s5pv210/setup-usb-phy.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

arch/arm/plat-samsung/include/plat/usb-phy.h

+1 −4
Original line number Diff line number Diff line
@@ -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);

drivers/usb/host/ehci-s5p.c

+0 −1
Original line number Diff line number Diff line
@@ -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>