From patchwork Mon Apr 15 12:38:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Bauer X-Patchwork-Id: 1085614 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=david-bauer.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44jSqV4NHFz9s47 for ; Mon, 15 Apr 2019 22:44:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727541AbfDOMoE (ORCPT ); Mon, 15 Apr 2019 08:44:04 -0400 Received: from mars.blocktrron.ovh ([51.254.112.43]:49518 "EHLO mail.blocktrron.ovh" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727214AbfDOMoE (ORCPT ); Mon, 15 Apr 2019 08:44:04 -0400 Received: from localhost.localdomain (ip-109-40-129-171.web.vodafone.de [109.40.129.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.blocktrron.ovh (Postfix) with ESMTPSA id BA38E22254; Mon, 15 Apr 2019 14:38:46 +0200 (CEST) From: David Bauer To: devicetree@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 3/3] net: mdio: rename mdio_device reset to reset_gpio Date: Mon, 15 Apr 2019 14:38:40 +0200 Message-Id: <20190415123840.31407-3-mail@david-bauer.net> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415123840.31407-1-mail@david-bauer.net> References: <20190415123840.31407-1-mail@david-bauer.net> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This renames the GPIO reset of mdio devices from 'reset' to 'reset_gpio' to better differentiate between GPIO and reset-controller driven reset line. Signed-off-by: David Bauer Reviewed-by: Andrew Lunn --- drivers/net/phy/mdio_bus.c | 6 +++--- drivers/net/phy/mdio_device.c | 6 +++--- include/linux/mdio.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 7590645f19ef..d1087bd24c83 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -56,7 +56,7 @@ static int mdiobus_register_gpiod(struct mdio_device *mdiodev) return PTR_ERR(gpiod); } - mdiodev->reset = gpiod; + mdiodev->reset_gpio = gpiod; /* Assert the reset signal again */ mdio_device_reset(mdiodev, 1); @@ -471,8 +471,8 @@ void mdiobus_unregister(struct mii_bus *bus) if (!mdiodev) continue; - if (mdiodev->reset) - gpiod_put(mdiodev->reset); + if (mdiodev->reset_gpio) + gpiod_put(mdiodev->reset_gpio); mdiodev->device_remove(mdiodev); mdiodev->device_free(mdiodev); diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c index 57668e0f9256..e282600bd83e 100644 --- a/drivers/net/phy/mdio_device.c +++ b/drivers/net/phy/mdio_device.c @@ -117,11 +117,11 @@ void mdio_device_reset(struct mdio_device *mdiodev, int value) { unsigned int d; - if (!mdiodev->reset && !mdiodev->reset_ctrl) + if (!mdiodev->reset_gpio && !mdiodev->reset_ctrl) return; - if (mdiodev->reset) - gpiod_set_value(mdiodev->reset, value); + if (mdiodev->reset_gpio) + gpiod_set_value(mdiodev->reset_gpio, value); if (mdiodev->reset_ctrl) { if (value) diff --git a/include/linux/mdio.h b/include/linux/mdio.h index 6eaf71500ef6..9dc16d5705a1 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -39,7 +39,7 @@ struct mdio_device { /* Bus address of the MDIO device (0-31) */ int addr; int flags; - struct gpio_desc *reset; + struct gpio_desc *reset_gpio; struct reset_control *reset_ctrl; unsigned int reset_assert_delay; unsigned int reset_deassert_delay;