From patchwork Mon Aug 19 15:56:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171647 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3176940ily; Mon, 19 Aug 2019 08:57:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqzWEBTREFms+WOYx4N23YsYc4rhTeAuQOzBH08Lmtgh+5HMWxoyt7urBWpmR87XXgD1dRbp X-Received: by 2002:a63:2252:: with SMTP id t18mr20599932pgm.5.1566230247480; Mon, 19 Aug 2019 08:57:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566230247; cv=none; d=google.com; s=arc-20160816; b=j2e3A16RyYnHjiEffG2eQJLAYRnROVb25cpMHdZbWvo+sOQQ0JCOBnt3Vt16iPVh+m nzQnUvg6AnKrvFau7/eLpftE3UmOILhK/wK+O/nxY+M7DyiZjL7U3Wyea3YEJb0Iofmt 5nenSD0ueH20kpmyTCK2/8WAmx0AxQkyct/nsl2pouNTmxGiHIaICQYdhNJ2192lW4iD rsKCYGxfGFYf3rn9ITPsGiusxOAjmVPmYuuIEEgBCF0ddluAcdxEKzH/u8q/2oQmxd7W ASa9d7ZsEI74J0E812JY0tpb3QkrdWaelslhNS30n7rVpgotJ+LXBPwEgcuq6JLCtpbR QPLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=4GK43BeKnZv5WyQmgfpb1RfuIr9VmwksRI1v6Lo8THA=; b=xg8EjieNQjrXOJBdFwTnjqB3J6q55IBTgMeTnU++zIykqfPYXucSHk66aRVjuHRsZP 133AkKPCm1P8JH63LGYAseilP6RRTmwLRVN+IxPND5WLEvQH/0mqo1lYuIH5ORhiJCWd UfifPTxbO755UvWN/jzpcwQ9fNmn7MbjKoYWxmWPPZwB1uRDsQo0/FG2ub5OsSkUK0Im Y38DMJpQavDmwSzRE6BUy8pw3rbRXOZQx+G9FSr5FBPqE5ZdWG2utW2hGgArNwjGYgxO gZ5lkWUQ3o4DBy3b4+/MY34m0RcCVTV8gb7Di8YWjj5adqc9WR/pAxJoo+kKzK0+qqp2 CVkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=Xh0II7dN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z3si4352124pju.89.2019.08.19.08.57.27; Mon, 19 Aug 2019 08:57:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=Xh0II7dN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727883AbfHSP50 (ORCPT + 28 others); Mon, 19 Aug 2019 11:57:26 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:26890 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726390AbfHSP50 (ORCPT ); Mon, 19 Aug 2019 11:57:26 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-08.nifty.com with ESMTP id x7JFu5LM008800; Tue, 20 Aug 2019 00:56:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x7JFu5LM008800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1566230165; bh=4GK43BeKnZv5WyQmgfpb1RfuIr9VmwksRI1v6Lo8THA=; h=From:To:Cc:Subject:Date:From; b=Xh0II7dN9ng2FE6abhAYGvXbe2CwYqlCE054fL0AeQ2SLcgkjj+zDnPUC3ID4Nuv/ cpCjIQUzgImo547Tj9TxCySIaXDAUIcoaWA12Zu8Yg2/tFIP+SkoYD74KhRz3MTf8d +XkA4f1QHfPHnbP6cH6IE09aYXLsP/xyLSRpnFgJulQ0agIPz043z+Jy3afwB/j46M xZcL4JZ1Dby9JysSD1xo9yoZvb80EQ4F7GQtJs5sj5ytrKr2K5lHD29mZv3DT3PBNN zGLeb0iB5kZC1i/fyzihUCu9R7JOr79qK53Me8uxIOlaKnSWhAJysY7RjB0NExavs7 gAxVJmWBXP1Qg== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: Kukjin Kim , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: Masahiro Yamada , Greg Kroah-Hartman , Russell King , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH] ARM: s3c64xx: squash samsung_usb_phy.h into setup-usb-phy.c Date: Tue, 20 Aug 2019 00:56:02 +0900 Message-Id: <20190819155602.20843-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Masahiro Yamada --- arch/arm/mach-s3c64xx/setup-usb-phy.c | 5 +++++ arch/arm/plat-samsung/include/plat/usb-phy.h | 2 -- include/linux/usb/samsung_usb_phy.h | 17 ----------------- 3 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 include/linux/usb/samsung_usb_phy.h -- 2.17.1 diff --git a/arch/arm/mach-s3c64xx/setup-usb-phy.c b/arch/arm/mach-s3c64xx/setup-usb-phy.c index 46a9e955607f..6aaaa1d8e8b9 100644 --- a/arch/arm/mach-s3c64xx/setup-usb-phy.c +++ b/arch/arm/mach-s3c64xx/setup-usb-phy.c @@ -15,6 +15,11 @@ #include "regs-sys.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) { struct clk *xusbxti; diff --git a/arch/arm/plat-samsung/include/plat/usb-phy.h b/arch/arm/plat-samsung/include/plat/usb-phy.h index 6d0c788beb9d..94da89ecbd3b 100644 --- a/arch/arm/plat-samsung/include/plat/usb-phy.h +++ b/arch/arm/plat-samsung/include/plat/usb-phy.h @@ -7,8 +7,6 @@ #ifndef __PLAT_SAMSUNG_USB_PHY_H #define __PLAT_SAMSUNG_USB_PHY_H __FILE__ -#include - 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/include/linux/usb/samsung_usb_phy.h b/include/linux/usb/samsung_usb_phy.h deleted file mode 100644 index dc0071741695..000000000000 --- a/include/linux/usb/samsung_usb_phy.h +++ /dev/null @@ -1,17 +0,0 @@ -// 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, -};