From patchwork Thu Jul 11 18:04:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zengtao (B)" X-Patchwork-Id: 11039541 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C292B6C5 for ; Thu, 11 Jul 2019 10:05:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5D6B288A6 for ; Thu, 11 Jul 2019 10:05:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A25128A22; Thu, 11 Jul 2019 10:05:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=2.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A804C2894B for ; Thu, 11 Jul 2019 10:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=5DOIQCHnHAfutbAfn4FS/iXP3jv7Jwat3AFGZwqhM4c=; b=OyBUwYepI+6kRm vgaiDIg9H+1ojghNiRy8KGMhyiDRLyNNLF6cp47j4zVcwvSZY1IF3l55+mgskB5496YcnfiPerHwJ Vx9Ux9RQk6MsAD2b8OmVz/wvq26YYjrZE7jda3oZqIXdWrcvTx3DpeGDaq756ADqJt79EATp5khCs HM99uj4Oj6PrrEmQDcwuAoHijlqRH73cCcgbiybRDyGU8Vwlj6ouhiORg7vW48W9vAoYxSA7R5JkZ Y+F6n5YbYoB8BUtE12lxcG7E3mD0u+Fa4FPtfZT7hZ0d9wvCX1ETDq9oLDgLGGhrm+huQLZ/uuHOk uz/EGfXZkinQdsjy07ig==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hlVxA-0003Tp-KY; Thu, 11 Jul 2019 10:05:28 +0000 Received: from szxga04-in.huawei.com ([45.249.212.190] helo=huawei.com) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hlVx5-0003SM-6b for linux-arm-kernel@lists.infradead.org; Thu, 11 Jul 2019 10:05:26 +0000 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 1FC3EE21183BD9091EEB; Thu, 11 Jul 2019 18:05:13 +0800 (CST) Received: from dessert.huawei.com (10.69.192.158) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Thu, 11 Jul 2019 18:05:05 +0800 From: Zeng Tao To: , Subject: [PATCH] phy: Change the configuration interface param to void* to make it more general Date: Fri, 12 Jul 2019 02:04:08 +0800 Message-ID: <1562868255-31467-1-git-send-email-prime.zeng@hisilicon.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [10.69.192.158] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190711_030524_989935_5369E653 X-CRM114-Status: GOOD ( 13.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Ripard , linux-kernel@vger.kernel.org, Paul Kocialkowski , Chen-Yu Tsai , Sakari Ailus , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The phy framework now allows runtime configurations, but only limited to mipi now, and it's not reasonable to introduce user specified configurations into the union phy_configure_opts structure. An simple way is to replace with a void *. We have already got some phy drivers which introduce private phy API for runtime configurations, and with this patch, they can switch to the phy_configure as a replace. Signed-off-by: Zeng Tao --- drivers/phy/allwinner/phy-sun6i-mipi-dphy.c | 4 ++-- drivers/phy/cadence/cdns-dphy.c | 8 ++++---- drivers/phy/phy-core.c | 4 ++-- include/linux/phy/phy.h | 24 ++++++------------------ 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/drivers/phy/allwinner/phy-sun6i-mipi-dphy.c b/drivers/phy/allwinner/phy-sun6i-mipi-dphy.c index 79c8af5..6a60473 100644 --- a/drivers/phy/allwinner/phy-sun6i-mipi-dphy.c +++ b/drivers/phy/allwinner/phy-sun6i-mipi-dphy.c @@ -105,12 +105,12 @@ static int sun6i_dphy_init(struct phy *phy) return 0; } -static int sun6i_dphy_configure(struct phy *phy, union phy_configure_opts *opts) +static int sun6i_dphy_configure(struct phy *phy, void *opts) { struct sun6i_dphy *dphy = phy_get_drvdata(phy); int ret; - ret = phy_mipi_dphy_config_validate(&opts->mipi_dphy); + ret = phy_mipi_dphy_config_validate(opts); if (ret) return ret; diff --git a/drivers/phy/cadence/cdns-dphy.c b/drivers/phy/cadence/cdns-dphy.c index 90c4e9b..0ec5013 100644 --- a/drivers/phy/cadence/cdns-dphy.c +++ b/drivers/phy/cadence/cdns-dphy.c @@ -233,23 +233,23 @@ static int cdns_dphy_config_from_opts(struct phy *phy, } static int cdns_dphy_validate(struct phy *phy, enum phy_mode mode, int submode, - union phy_configure_opts *opts) + void *opts) { struct cdns_dphy_cfg cfg = { 0 }; if (mode != PHY_MODE_MIPI_DPHY) return -EINVAL; - return cdns_dphy_config_from_opts(phy, &opts->mipi_dphy, &cfg); + return cdns_dphy_config_from_opts(phy, opts, &cfg); } -static int cdns_dphy_configure(struct phy *phy, union phy_configure_opts *opts) +static int cdns_dphy_configure(struct phy *phy, void *opts) { struct cdns_dphy *dphy = phy_get_drvdata(phy); struct cdns_dphy_cfg cfg = { 0 }; int ret; - ret = cdns_dphy_config_from_opts(phy, &opts->mipi_dphy, &cfg); + ret = cdns_dphy_config_from_opts(phy, opts, &cfg); if (ret) return ret; diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index e3880c4a1..048d4d6 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -420,7 +420,7 @@ EXPORT_SYMBOL_GPL(phy_calibrate); * * Returns: 0 if successful, an negative error code otherwise */ -int phy_configure(struct phy *phy, union phy_configure_opts *opts) +int phy_configure(struct phy *phy, void *opts) { int ret; @@ -455,7 +455,7 @@ EXPORT_SYMBOL_GPL(phy_configure); * Returns: 0 if successful, an negative error code otherwise */ int phy_validate(struct phy *phy, enum phy_mode mode, int submode, - union phy_configure_opts *opts) + void *opts) { int ret; diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h index 15032f14..8948f94 100644 --- a/include/linux/phy/phy.h +++ b/include/linux/phy/phy.h @@ -16,8 +16,6 @@ #include #include -#include - struct phy; enum phy_mode { @@ -41,15 +39,6 @@ enum phy_mode { PHY_MODE_SATA }; -/** - * union phy_configure_opts - Opaque generic phy configuration - * - * @mipi_dphy: Configuration set applicable for phys supporting - * the MIPI_DPHY phy mode. - */ -union phy_configure_opts { - struct phy_configure_opts_mipi_dphy mipi_dphy; -}; /** * struct phy_ops - set of function pointers for performing phy operations @@ -80,7 +69,7 @@ struct phy_ops { * * Returns: 0 if successful, an negative error code otherwise */ - int (*configure)(struct phy *phy, union phy_configure_opts *opts); + int (*configure)(struct phy *phy, void *opts); /** * @validate: @@ -99,7 +88,7 @@ struct phy_ops { * error code otherwise */ int (*validate)(struct phy *phy, enum phy_mode mode, int submode, - union phy_configure_opts *opts); + void *opts); int (*reset)(struct phy *phy); int (*calibrate)(struct phy *phy); void (*release)(struct phy *phy); @@ -207,9 +196,9 @@ int phy_power_off(struct phy *phy); int phy_set_mode_ext(struct phy *phy, enum phy_mode mode, int submode); #define phy_set_mode(phy, mode) \ phy_set_mode_ext(phy, mode, 0) -int phy_configure(struct phy *phy, union phy_configure_opts *opts); +int phy_configure(struct phy *phy, void *opts); int phy_validate(struct phy *phy, enum phy_mode mode, int submode, - union phy_configure_opts *opts); + void *opts); static inline enum phy_mode phy_get_mode(struct phy *phy) { @@ -354,8 +343,7 @@ static inline int phy_calibrate(struct phy *phy) return -ENOSYS; } -static inline int phy_configure(struct phy *phy, - union phy_configure_opts *opts) +static inline int phy_configure(struct phy *phy, void *opts) { if (!phy) return 0; @@ -364,7 +352,7 @@ static inline int phy_configure(struct phy *phy, } static inline int phy_validate(struct phy *phy, enum phy_mode mode, int submode, - union phy_configure_opts *opts) + void *opts) { if (!phy) return 0;