From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8ABFBC169C4 for ; Sun, 3 Feb 2019 19:36:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4494D21773 for ; Sun, 3 Feb 2019 19:36:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Xn24bKb0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727605AbfBCTgK (ORCPT ); Sun, 3 Feb 2019 14:36:10 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:42043 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726784AbfBCTgJ (ORCPT ); Sun, 3 Feb 2019 14:36:09 -0500 Received: by mail-wr1-f67.google.com with SMTP id q18so12248495wrx.9 for ; Sun, 03 Feb 2019 11:36:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=VKmYwKo44KWFuUpAqAh7YgmI4wPvxTeQ8yj+r1QVbQs=; b=Xn24bKb0HzH6BOBJ+rkYnk8GvPNF0eD1fIuwoybAInIkTSkCGw0uHL4FmQi+K0xBPV mWDFJkPVnGMaGAqvoa8mb/SqI4ZAAKfBk5v8s7XOYj2XgdIx22sUQ7O2+AaBzF2JoEi+ j+73txahxHn09RW7YFgRqkpX5f+bYnjTbbeJiUXAM6e0hPL4FfzB9P0H/Q5ED8CaIhmS KWc4hyWIRhFMQoQU0mN83abCk8LDQxcjaJOfPwPuh1fypRWQY/KLP41iS7iJ4bTnJbjG u1bQmtfXgWyHCWLAHn22/qnsRCX+ILbhcPa9GL8+lsL+Fx87OWPsNVXKvLCyZH7U2px4 2yrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=VKmYwKo44KWFuUpAqAh7YgmI4wPvxTeQ8yj+r1QVbQs=; b=ouBkEwu4bKishlm+QvtvpOPN6v9W5MCLnFGeKrc4MzUSb/QbRd2gfMzM5i26bSvGCr EYL7iUJCwio2BTA+40eONmVumrZPd8/mkPp/YaCDLA81X+RMTS4HTRew8E1NJFFA5jjk ucbU+pmeDfdH7/iaRXYoGMQm11Rvndv1E71zi6eqd7wcEvvwh7aNu6RK0qGXf77cLv9s dyb4vfJRlh5Xv0OR00ztoPMYsX7vJADT39AIuwWnDTIAY+cdmfJolsRSyv/0PLmliiKW DHXBj0gb1SsGx9SZIhyxmhpACM+GHYL7gihMEuX4Vnzgyr+22CgoU5R05KOi6uLIw5yR RgEQ== X-Gm-Message-State: AHQUAua6N51g1HGhhnMzJBRe9dxDDndkDXBCSEEvtHj3TpZ5CYhKGZG6 5TSt8w1WzuYgZjcrTmBz3GHSMoAG X-Google-Smtp-Source: AHgI3Iavg8tPtnxx17BhIvJ+24m5gIt4HgRfD+llgRxqBW0RBkEZ8ZC72TY9/Hay74n89ldpZnV3fQ== X-Received: by 2002:adf:f9ca:: with SMTP id w10mr4439528wrr.189.1549222567018; Sun, 03 Feb 2019 11:36:07 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:b082:4f91:1c1c:ad3? ([2003:ea:8bf1:e200:b082:4f91:1c1c:ad3]) by smtp.googlemail.com with ESMTPSA id u204sm10893965wmu.30.2019.02.03.11.36.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Feb 2019 11:36:06 -0800 (PST) Subject: [PATCH 1/4 net-next] net: phy: aquantia: shorten name space prefix to aqr_ From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: <08812313-471b-79c2-f667-bace78acf0fe@gmail.com> Message-ID: Date: Sun, 3 Feb 2019 20:33:13 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 MIME-Version: 1.0 In-Reply-To: <08812313-471b-79c2-f667-bace78acf0fe@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Andrew Lunn aquantia_ as a name space prefix is rather long, resulting in lots of lines needing wrapping, reducing readability. Use the prefix aqr_ instead, which fits with the vendor naming there devices aqr107, for example. Signed-off-by: Andrew Lunn --- drivers/net/phy/aquantia.c | 64 +++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index 0578fe75d..880ec4bba 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -22,7 +22,7 @@ #define PHY_ID_AQR107 0x03a1b4e0 #define PHY_ID_AQR405 0x03a1b4b0 -static int aquantia_config_aneg(struct phy_device *phydev) +static int aqr_config_aneg(struct phy_device *phydev) { linkmode_copy(phydev->supported, phy_10gbit_features); linkmode_copy(phydev->advertising, phydev->supported); @@ -30,7 +30,7 @@ static int aquantia_config_aneg(struct phy_device *phydev) return 0; } -static int aquantia_config_intr(struct phy_device *phydev) +static int aqr_config_intr(struct phy_device *phydev) { int err; @@ -59,7 +59,7 @@ static int aquantia_config_intr(struct phy_device *phydev) return err; } -static int aquantia_ack_interrupt(struct phy_device *phydev) +static int aqr_ack_interrupt(struct phy_device *phydev) { int reg; @@ -67,7 +67,7 @@ static int aquantia_ack_interrupt(struct phy_device *phydev) return (reg < 0) ? reg : 0; } -static int aquantia_read_status(struct phy_device *phydev) +static int aqr_read_status(struct phy_device *phydev) { int reg; @@ -102,17 +102,17 @@ static int aquantia_read_status(struct phy_device *phydev) return 0; } -static struct phy_driver aquantia_driver[] = { +static struct phy_driver aqr_driver[] = { { .phy_id = PHY_ID_AQ1202, .phy_id_mask = 0xfffffff0, .name = "Aquantia AQ1202", .features = PHY_10GBIT_FULL_FEATURES, .aneg_done = genphy_c45_aneg_done, - .config_aneg = aquantia_config_aneg, - .config_intr = aquantia_config_intr, - .ack_interrupt = aquantia_ack_interrupt, - .read_status = aquantia_read_status, + .config_aneg = aqr_config_aneg, + .config_intr = aqr_config_intr, + .ack_interrupt = aqr_ack_interrupt, + .read_status = aqr_read_status, }, { .phy_id = PHY_ID_AQ2104, @@ -120,10 +120,10 @@ static struct phy_driver aquantia_driver[] = { .name = "Aquantia AQ2104", .features = PHY_10GBIT_FULL_FEATURES, .aneg_done = genphy_c45_aneg_done, - .config_aneg = aquantia_config_aneg, - .config_intr = aquantia_config_intr, - .ack_interrupt = aquantia_ack_interrupt, - .read_status = aquantia_read_status, + .config_aneg = aqr_config_aneg, + .config_intr = aqr_config_intr, + .ack_interrupt = aqr_ack_interrupt, + .read_status = aqr_read_status, }, { .phy_id = PHY_ID_AQR105, @@ -131,10 +131,10 @@ static struct phy_driver aquantia_driver[] = { .name = "Aquantia AQR105", .features = PHY_10GBIT_FULL_FEATURES, .aneg_done = genphy_c45_aneg_done, - .config_aneg = aquantia_config_aneg, - .config_intr = aquantia_config_intr, - .ack_interrupt = aquantia_ack_interrupt, - .read_status = aquantia_read_status, + .config_aneg = aqr_config_aneg, + .config_intr = aqr_config_intr, + .ack_interrupt = aqr_ack_interrupt, + .read_status = aqr_read_status, }, { .phy_id = PHY_ID_AQR106, @@ -142,10 +142,10 @@ static struct phy_driver aquantia_driver[] = { .name = "Aquantia AQR106", .features = PHY_10GBIT_FULL_FEATURES, .aneg_done = genphy_c45_aneg_done, - .config_aneg = aquantia_config_aneg, - .config_intr = aquantia_config_intr, - .ack_interrupt = aquantia_ack_interrupt, - .read_status = aquantia_read_status, + .config_aneg = aqr_config_aneg, + .config_intr = aqr_config_intr, + .ack_interrupt = aqr_ack_interrupt, + .read_status = aqr_read_status, }, { .phy_id = PHY_ID_AQR107, @@ -153,10 +153,10 @@ static struct phy_driver aquantia_driver[] = { .name = "Aquantia AQR107", .features = PHY_10GBIT_FULL_FEATURES, .aneg_done = genphy_c45_aneg_done, - .config_aneg = aquantia_config_aneg, - .config_intr = aquantia_config_intr, - .ack_interrupt = aquantia_ack_interrupt, - .read_status = aquantia_read_status, + .config_aneg = aqr_config_aneg, + .config_intr = aqr_config_intr, + .ack_interrupt = aqr_ack_interrupt, + .read_status = aqr_read_status, }, { .phy_id = PHY_ID_AQR405, @@ -164,16 +164,16 @@ static struct phy_driver aquantia_driver[] = { .name = "Aquantia AQR405", .features = PHY_10GBIT_FULL_FEATURES, .aneg_done = genphy_c45_aneg_done, - .config_aneg = aquantia_config_aneg, - .config_intr = aquantia_config_intr, - .ack_interrupt = aquantia_ack_interrupt, - .read_status = aquantia_read_status, + .config_aneg = aqr_config_aneg, + .config_intr = aqr_config_intr, + .ack_interrupt = aqr_ack_interrupt, + .read_status = aqr_read_status, }, }; -module_phy_driver(aquantia_driver); +module_phy_driver(aqr_driver); -static struct mdio_device_id __maybe_unused aquantia_tbl[] = { +static struct mdio_device_id __maybe_unused aqr_tbl[] = { { PHY_ID_AQ1202, 0xfffffff0 }, { PHY_ID_AQ2104, 0xfffffff0 }, { PHY_ID_AQR105, 0xfffffff0 }, @@ -183,7 +183,7 @@ static struct mdio_device_id __maybe_unused aquantia_tbl[] = { { } }; -MODULE_DEVICE_TABLE(mdio, aquantia_tbl); +MODULE_DEVICE_TABLE(mdio, aqr_tbl); MODULE_DESCRIPTION("Aquantia PHY driver"); MODULE_AUTHOR("Shaohui Xie "); -- 2.20.1