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.
Unified · Split
| @@ -15,6 +15,11 @@ · 14 unmodified lines | |||
| 15 | #include "regs-sys.h" | 15 | #include "regs-sys.h" |
| 16 | #include "regs-usb-hsotg-phy.h" | 16 | #include "regs-usb-hsotg-phy.h" |
| 17 | 17 | ||
| 18 | enum samsung_usb_phy_type { | ||
| 19 | USB_PHY_TYPE_DEVICE, | ||
| 20 | USB_PHY_TYPE_HOST, | ||
| 21 | }; | ||
| 22 | |||
| 18 | static int s3c_usb_otgphy_init(struct platform_device *pdev) | 23 | static int s3c_usb_otgphy_init(struct platform_device *pdev) |
| 19 | { | 24 | { |
| 20 | struct clk *xusbxti; | 25 | struct clk *xusbxti; |
| @@ -7,8 +7,6 @@ · 6 unmodified lines | |||
| 7 | #ifndef __PLAT_SAMSUNG_USB_PHY_H | 7 | #ifndef __PLAT_SAMSUNG_USB_PHY_H |
| 8 | #define __PLAT_SAMSUNG_USB_PHY_H __FILE__ | 8 | #define __PLAT_SAMSUNG_USB_PHY_H __FILE__ |
| 9 | 9 | ||
| 10 | #include <linux/usb/samsung_usb_phy.h> | ||
| 11 | |||
| 12 | extern int s5p_usb_phy_init(struct platform_device *pdev, int type); | 10 | extern int s5p_usb_phy_init(struct platform_device *pdev, int type); |
| 13 | extern int s5p_usb_phy_exit(struct platform_device *pdev, int type); | 11 | extern int s5p_usb_phy_exit(struct platform_device *pdev, int type); |
| 14 | 12 | ||
| @@ -1,17 +0,0 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0+ | ||
| 2 | /* | ||
| 3 | * Copyright (C) 2012 Samsung Electronics Co.Ltd | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * Defines phy types for samsung usb phy controllers - HOST or DEIVCE. | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify it | ||
| 9 | * under the terms of the GNU General Public License as published by the | ||
| 10 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 11 | * option) any later version. | ||
| 12 | */ | ||
| 13 | |||
| 14 | enum samsung_usb_phy_type { | ||
| 15 | USB_PHY_TYPE_DEVICE, | ||
| 16 | USB_PHY_TYPE_HOST, | ||
| 17 | }; | ||