Commit d1dec5ca authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Krzysztof Kozlowski
Browse files

ARM: s3c64xx: squash samsung_usb_phy.h into setup-usb-phy.c 



This is only used by arch/arm/mach-s3c64xx/setup-usb-phy.c

$ git grep samsung_usb_phy_type
include/linux/usb/samsung_usb_phy.h:enum samsung_usb_phy_type {
$ git grep USB_PHY_TYPE_DEVICE
arch/arm/mach-s3c64xx/setup-usb-phy.c:  if (type == USB_PHY_TYPE_DEVICE)
arch/arm/mach-s3c64xx/setup-usb-phy.c:  if (type == USB_PHY_TYPE_DEVICE)
include/linux/usb/samsung_usb_phy.h:    USB_PHY_TYPE_DEVICE,
$ git grep USB_PHY_TYPE_HOST
include/linux/usb/samsung_usb_phy.h:    USB_PHY_TYPE_HOST,

Actually, 'enum samsung_usb_phy_type' is unused; the 'type' parameter
has 'int' type. Anyway, there is no need to declare this enum in the
globally visible header. Squash the header.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent 1fa70c7f

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,11 @@ 
#include "regs-sys.h"

#include "regs-sys.h"

#include "regs-usb-hsotg-phy.h"

#include "regs-usb-hsotg-phy.h"





enum samsung_usb_phy_type {

	USB_PHY_TYPE_DEVICE,

	USB_PHY_TYPE_HOST,

};



static int s3c_usb_otgphy_init(struct platform_device *pdev)

static int s3c_usb_otgphy_init(struct platform_device *pdev)

{

{

	struct clk *xusbxti;

	struct clk *xusbxti;

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -7,8 +7,6 @@ 
#ifndef __PLAT_SAMSUNG_USB_PHY_H

#ifndef __PLAT_SAMSUNG_USB_PHY_H

#define __PLAT_SAMSUNG_USB_PHY_H __FILE__

#define __PLAT_SAMSUNG_USB_PHY_H __FILE__





#include <linux/usb/samsung_usb_phy.h>



extern int s5p_usb_phy_init(struct platform_device *pdev, int type);

extern int s5p_usb_phy_init(struct platform_device *pdev, int type);

extern int s5p_usb_phy_exit(struct platform_device *pdev, int type);

extern int s5p_usb_phy_exit(struct platform_device *pdev, int type);

include/linux/usb/samsung_usb_phy.h

deleted100644 → 0
+0 −17
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Copyright (C) 2012 Samsung Electronics Co.Ltd

 *		http://www.samsung.com/

 *

 * Defines phy types for samsung usb phy controllers - HOST or DEIVCE.

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



enum samsung_usb_phy_type {

	USB_PHY_TYPE_DEVICE,

	USB_PHY_TYPE_HOST,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE