From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Lunn Subject: [RFC PATCH net-next 01/24] phy: Consistently use addr for address on an MII bus Date: Mon, 4 Jan 2016 18:36:39 +0100 Message-ID: <1451929022-5580-2-git-send-email-andrew@lunn.ch> References: <1451929022-5580-1-git-send-email-andrew@lunn.ch> Cc: netdev , Andrew Lunn To: Florian Fainelli Return-path: Received: from vps0.lunn.ch ([178.209.37.122]:34952 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752790AbcADRhq (ORCPT ); Mon, 4 Jan 2016 12:37:46 -0500 In-Reply-To: <1451929022-5580-1-git-send-email-andrew@lunn.ch> Sender: netdev-owner@vger.kernel.org List-ID: Within phy.h, an address on an MII bus has been called both addr and phy_id. phy_id is particularly confusion, since it also means the ID found in register 3, if the device on the bus is a phy. Consistently use addr. Signed-off-by: Andrew Lunn --- include/linux/phy.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/phy.h b/include/linux/phy.h index a89cb0eef911..77b5e56e2a92 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -158,8 +158,8 @@ struct mii_bus { const char *name; char id[MII_BUS_ID_SIZE]; void *priv; - int (*read)(struct mii_bus *bus, int phy_id, int regnum); - int (*write)(struct mii_bus *bus, int phy_id, int regnum, u16 val); + int (*read)(struct mii_bus *bus, int addr, int regnum); + int (*write)(struct mii_bus *bus, int addr, int regnum, u16 val); int (*reset)(struct mii_bus *bus); /* -- 2.6.4