From patchwork Sun Feb 3 20:16:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1035636 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UfgmRNYQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43t2JF43bVz9sDX for ; Mon, 4 Feb 2019 07:19:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727115AbfBCUTy (ORCPT ); Sun, 3 Feb 2019 15:19:54 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:52654 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726599AbfBCUTy (ORCPT ); Sun, 3 Feb 2019 15:19:54 -0500 Received: by mail-wm1-f66.google.com with SMTP id m1so11119899wml.2 for ; Sun, 03 Feb 2019 12:19:52 -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=rWQ1YRD1fUB82SyHMo/3iH4PadjRn7Rim/p/uGBVfMM=; b=UfgmRNYQrWFXhmmPzQP5Wvnyr6pHcJhBa5+kIi4GQ+ECy7RnpOwoVk+LxuCSr0Uffb bgh3JK+0zApVmd3WlAtgS2VC2EFeHgNPeSflkmnJYtLwoibmt1u+UuW/97o6FYI9NEZU CZxhi8yloGgmUxxQ1Y1+hV3ukJPAAksMJ8wRqc/4lXVCZ8ZXXipR9mjJCq4ghOJsjqBE YmHD1o7rKhJ1ScnDc9JnA8sNEVrihOvCJseZMmf1m+31JFnV624eiRnVlccxJ2dpJk/y 2qq92ATcV31xozBQ84mRyfk5bnyMa6rI9hrQwPE2ZAODVDPd5/tsjoFLnV+WWYUWof0r 9VBA== 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=rWQ1YRD1fUB82SyHMo/3iH4PadjRn7Rim/p/uGBVfMM=; b=oj1IfbNagIWFD7JrIS4y6R5rjhT+QiuzIsTZP255lBE/gXFxL+cnzuq+8Kv8U5VzhN uYAMMFTF+7LPESNTCSdxdzsAc/rLNlLOwpcfDpSkq5rmM2nZdop0WlOMwAqCANmOVOZm w6EgUFiI4ER5h/fm7FkmRHOW1GPLAMpVCiO4Aw/QLKDRjC7TvUuYUrjqTTl8nYBE8ahA jBifbqIHJDKAxN0Ie0gmnaaTiET66iKu4ZddmzWIKJivfN5mNYJxRiSA4plA2pgSB15P Yz1JSs7RbkWpflRHF5bK3cGLXcWmahkRgLIauclXXUay+36pb2dUKpZzUYlgtt9irPDG R3Sg== X-Gm-Message-State: AHQUAuZUhxybAIKddBJFv0ojjVstZ0uwy4PyQg6dE6bCx27uZKzxOTM8 muBuX56hj+3ib0PI7ejWRu29FO8V X-Google-Smtp-Source: AHgI3IYAxivZXocAm9IXqGTK2Hddy/VD2GTdLay6sJqdTpiq2+0fY7aMUoImHNRI6npc4yhm4TRkrA== X-Received: by 2002:a1c:8089:: with SMTP id b131mr10866893wmd.141.1549225191453; Sun, 03 Feb 2019 12:19:51 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:b082:4f91:1c1c:ad3? (p200300EA8BF1E200B0824F911C1C0AD3.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:b082:4f91:1c1c:ad3]) by smtp.googlemail.com with ESMTPSA id a15sm821369wrx.58.2019.02.03.12.19.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Feb 2019 12:19:50 -0800 (PST) Subject: [PATCH 1/4 v2 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: Message-ID: <1fb5b1ad-d58d-b2e8-6395-84dd719c92d0@gmail.com> Date: Sun, 3 Feb 2019 21:16:18 +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: Content-Language: en-US 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. v2: - add SoB from Heiner Signed-off-by: Andrew Lunn Signed-off-by: Heiner Kallweit --- 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 "); From patchwork Sun Feb 3 20:17:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1035637 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vAY13GtU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43t2JG58FKz9sDr for ; Mon, 4 Feb 2019 07:19:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727413AbfBCUT5 (ORCPT ); Sun, 3 Feb 2019 15:19:57 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54291 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726779AbfBCUTz (ORCPT ); Sun, 3 Feb 2019 15:19:55 -0500 Received: by mail-wm1-f68.google.com with SMTP id a62so11111706wmh.4 for ; Sun, 03 Feb 2019 12:19:54 -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=sJ7u9xhnfZpR8JZH0fC0GOblxLsTJlKDds/QqgsZDeQ=; b=vAY13GtU5FeOv6/bGjSwD4WoowLMwITqmNTPpXXYVs8MKfycNzCSzT3/0LszNiqOIJ EeItpRbmbPbpyQShHRJrq4e9tDmDjkoHhcPm/DsQBvVw+oiMdW1pkdTik0wivlh4ZyOj 0425sUQJ3NnVOhlZ3PODHtT0NF8yzXzF+j8zLWyhCnTrJUWidkUO8q4iTFZ1X8MUVBj6 0o6/2gbqJCDMJZdKi/WOVE57XZRia1i7W3IY/KAAjKEYSV222weZyT32oJsBXHL9xsvx dTlJgJx7XL5QevJ+CD41J6wS1gQBRudZG5v3hkrilpzp+NS5kLS3EM2LH8WgqWYzEM4A v6Ew== 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=sJ7u9xhnfZpR8JZH0fC0GOblxLsTJlKDds/QqgsZDeQ=; b=eg5e1BlOw+7vvMGi8wr8fB9+Y+MCnAcBkmXJ1w3RxnhQmHVioR5e02eahs51FKkAO8 lmyXsC9cD6oeG9xEQRKd+2t8G5e/4GGl2L6gCoL3mpAK2lHbglBO6g/D/yr8aEygBe2+ /wDETz4VBJWjWEiwlB6pK8fojGycQnEq3Vp2AFi3Nf5EmiB1xz/XdSJHWUKfy3ypKc5S Cv8CR0g/nZTEbKXNf8pxylNniZm+8DjZq+HOi3BaYwM0aofZrgSefNpuKi9s74uD91Rw 44qFTSWmzIoQnNxco8g1m2J+BsBGVc0H5xVQguOWJsBpC78t3ILin7PlKnfM85lFG4eQ yEDA== X-Gm-Message-State: AHQUAuaKUR5+n71JgifqrZnBWU/oOf1oHmO0oCds/wcJGxLVoHo61Ve4 L13fDCNLG6uimzlSpl0aeqhQUOVB X-Google-Smtp-Source: AHgI3Ibt7LULL0VIpJiuJCFYSXgs0JTZyKiY+CAZ3bbZbAOemj9VP+pbM0J+7otyBnX5xFrzb3xOkA== X-Received: by 2002:a1c:bdc5:: with SMTP id n188mr11252378wmf.69.1549225193193; Sun, 03 Feb 2019 12:19:53 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:b082:4f91:1c1c:ad3? (p200300EA8BF1E200B0824F911C1C0AD3.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:b082:4f91:1c1c:ad3]) by smtp.googlemail.com with ESMTPSA id h62sm9005948wmf.11.2019.02.03.12.19.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Feb 2019 12:19:52 -0800 (PST) Subject: [PATCH 2/4 v2 net-next] net: phy: aquantia: remove unneeded includes From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sun, 3 Feb 2019 21:17:14 +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: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove unneeded header includes. v2: - leave kernel.h in Signed-off-by: Heiner Kallweit --- drivers/net/phy/aquantia.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index 880ec4bba..2b349de1d 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -10,10 +10,7 @@ #include #include #include -#include -#include #include -#include #define PHY_ID_AQ1202 0x03a1b445 #define PHY_ID_AQ2104 0x03a1b460 From patchwork Sun Feb 3 20:18:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1035638 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GNQ8w/02"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43t2JK09wsz9sDX for ; Mon, 4 Feb 2019 07:20:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727603AbfBCUT7 (ORCPT ); Sun, 3 Feb 2019 15:19:59 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:34099 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727296AbfBCUT5 (ORCPT ); Sun, 3 Feb 2019 15:19:57 -0500 Received: by mail-wr1-f67.google.com with SMTP id f7so12444290wrp.1 for ; Sun, 03 Feb 2019 12:19:56 -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=dy502cNBQp75MzctoTOSrB53Cx3tkvINKQQlknFC6y8=; b=GNQ8w/02w4gyd3LKucVKI7UlCxrGbN4lJ9rtUsDUVVP2PYnziAwoJQGRQq56oJSs3L Iv86v36Aap8UcP59fCqayzOSCsBJ6GBG87xqU4OjVqlYCRbFxD7YKxePq3oK9udTA5Cb cuHsJhZ5HZHXUSwbeb+O/qyUHhDpY4YF7Jp7/7FxQ8mwHhNX9DLCHTpI826PpYmxLwOH 6fcGUnLgHRS9x7CVKJ/+gqailc6CV8iG+PGf+8ytHvMG58mqwOQjx3/jMMvGObMOmFDZ meBAm5uuvlyBiP/9PKmMs1lubJJKV4gpDfesGXFCNRrCACJzT/HPFXbUVlKRuNw0Sk+/ +wTA== 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=dy502cNBQp75MzctoTOSrB53Cx3tkvINKQQlknFC6y8=; b=jrzqmR+uk6K7FxK+mSD7FsR/24GKYAqUKOII9qygUWFMrGwjSG34s0VSKLWOahtT46 KHciAtQrOoFtSYFKYMEvJE3hCS8SsKH+xAwDKHtgiQ/tdSeEQvgM2AKJ0qCpatI3jrEQ gfuWzpa558nR8V0BSxwG4ruymLPTm3Fv4bEBLzZTLORtZvhuCtk2BpFQI0LYb9QRvBVL nZX/Nn8YCoC/kSx/Mgv1MnJSnffDRLB6UgI7hwfJUq3oQB7Jlw2axsz1I5GRIXCqPlHY NRKdaCa5BKesMp+pe0hY1gwsVbSLTTP4N21/X0ggi0hCBE802mFt8mzza4/DuRucT/ub sUeA== X-Gm-Message-State: AJcUuketdCL3ZDsxf5vXzWDNBPGWtLWkwhqTgi8UmaSh20P63cp2H+PB 15zRZbR331dQEPOyqtdatvzmRo1n X-Google-Smtp-Source: ALg8bN4r9xlOsm45p1ykL2skGieNFPZZdXlPjJ27wbtu2XbB1+rYDslUJf0EmxjmkdV2ekFEamfAPg== X-Received: by 2002:adf:f888:: with SMTP id u8mr44910494wrp.297.1549225195584; Sun, 03 Feb 2019 12:19:55 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:b082:4f91:1c1c:ad3? (p200300EA8BF1E200B0824F911C1C0AD3.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:b082:4f91:1c1c:ad3]) by smtp.googlemail.com with ESMTPSA id o4sm4256717wrm.12.2019.02.03.12.19.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Feb 2019 12:19:54 -0800 (PST) Subject: [PATCH 3/4 v2 net-next] net: phy: aquantia: use macro PHY_ID_MATCH_MODEL From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sun, 3 Feb 2019 21:18:03 +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: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make use of macro PHY_ID_MATCH_MODEL to simplify the code. Signed-off-by: Heiner Kallweit Reviewed-by: Andrew Lunn --- drivers/net/phy/aquantia.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index 2b349de1d..fde437506 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -101,8 +101,7 @@ static int aqr_read_status(struct phy_device *phydev) static struct phy_driver aqr_driver[] = { { - .phy_id = PHY_ID_AQ1202, - .phy_id_mask = 0xfffffff0, + PHY_ID_MATCH_MODEL(PHY_ID_AQ1202), .name = "Aquantia AQ1202", .features = PHY_10GBIT_FULL_FEATURES, .aneg_done = genphy_c45_aneg_done, @@ -112,8 +111,7 @@ static struct phy_driver aqr_driver[] = { .read_status = aqr_read_status, }, { - .phy_id = PHY_ID_AQ2104, - .phy_id_mask = 0xfffffff0, + PHY_ID_MATCH_MODEL(PHY_ID_AQ2104), .name = "Aquantia AQ2104", .features = PHY_10GBIT_FULL_FEATURES, .aneg_done = genphy_c45_aneg_done, @@ -123,8 +121,7 @@ static struct phy_driver aqr_driver[] = { .read_status = aqr_read_status, }, { - .phy_id = PHY_ID_AQR105, - .phy_id_mask = 0xfffffff0, + PHY_ID_MATCH_MODEL(PHY_ID_AQR105), .name = "Aquantia AQR105", .features = PHY_10GBIT_FULL_FEATURES, .aneg_done = genphy_c45_aneg_done, @@ -134,8 +131,7 @@ static struct phy_driver aqr_driver[] = { .read_status = aqr_read_status, }, { - .phy_id = PHY_ID_AQR106, - .phy_id_mask = 0xfffffff0, + PHY_ID_MATCH_MODEL(PHY_ID_AQR106), .name = "Aquantia AQR106", .features = PHY_10GBIT_FULL_FEATURES, .aneg_done = genphy_c45_aneg_done, @@ -145,8 +141,7 @@ static struct phy_driver aqr_driver[] = { .read_status = aqr_read_status, }, { - .phy_id = PHY_ID_AQR107, - .phy_id_mask = 0xfffffff0, + PHY_ID_MATCH_MODEL(PHY_ID_AQR107), .name = "Aquantia AQR107", .features = PHY_10GBIT_FULL_FEATURES, .aneg_done = genphy_c45_aneg_done, @@ -156,8 +151,7 @@ static struct phy_driver aqr_driver[] = { .read_status = aqr_read_status, }, { - .phy_id = PHY_ID_AQR405, - .phy_id_mask = 0xfffffff0, + PHY_ID_MATCH_MODEL(PHY_ID_AQR405), .name = "Aquantia AQR405", .features = PHY_10GBIT_FULL_FEATURES, .aneg_done = genphy_c45_aneg_done, @@ -171,12 +165,12 @@ static struct phy_driver aqr_driver[] = { module_phy_driver(aqr_driver); static struct mdio_device_id __maybe_unused aqr_tbl[] = { - { PHY_ID_AQ1202, 0xfffffff0 }, - { PHY_ID_AQ2104, 0xfffffff0 }, - { PHY_ID_AQR105, 0xfffffff0 }, - { PHY_ID_AQR106, 0xfffffff0 }, - { PHY_ID_AQR107, 0xfffffff0 }, - { PHY_ID_AQR405, 0xfffffff0 }, + { PHY_ID_MATCH_MODEL(PHY_ID_AQ1202) }, + { PHY_ID_MATCH_MODEL(PHY_ID_AQ2104) }, + { PHY_ID_MATCH_MODEL(PHY_ID_AQR105) }, + { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, + { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, + { PHY_ID_MATCH_MODEL(PHY_ID_AQR405) }, { } }; From patchwork Sun Feb 3 20:19:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1035639 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="chBXi1Bc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43t2JM2PWSz9sDX for ; Mon, 4 Feb 2019 07:20:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727667AbfBCUUB (ORCPT ); Sun, 3 Feb 2019 15:20:01 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:43034 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727502AbfBCUT7 (ORCPT ); Sun, 3 Feb 2019 15:19:59 -0500 Received: by mail-wr1-f66.google.com with SMTP id r2so644935wrv.10 for ; Sun, 03 Feb 2019 12:19:58 -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=U/8pAkyblDiGL8jRw2DNZgHe9gJamauSFcYqKLlRBt8=; b=chBXi1BcP4F2IDaW2q5FJBHOxTX/nhzUd02oamP08OMVDmBeX0fIvTkaaWqS5NINzc SELjo22WXikpHnkkyWYxtusrnPAH26Ai1XIif3M6eQ9S6wT1J/9s79NwaT3AxhY6lipF u6H5OEq3WIXbMnaiil/id9ZMZZRT/iucshpSeoP0kB3WlarF+I7vKo2kfJsPwRlR+rqg P4l//i83eFKSMQlYebTDxMKldGkBENKG7+AdI9sD5ccMy+I9epFKQMfqwbz3216ABHvM TU7IOrrLm/tSgUFyI+fGuYK+aWvfW8eZu1nJbIL2IKb81ZyzjwwHg2PElkVd0Q0IdNpv 88yw== 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=U/8pAkyblDiGL8jRw2DNZgHe9gJamauSFcYqKLlRBt8=; b=jXf9Uln/stE5ETPIZvoEK2qzJdghhtJH6esK6Y4SdaIN3pz57C2IURHt9gk4l5bSwr vhw5sKCmxFGr4MeYgyXQ2cAiPztnwsBdFdMy/fePd9wl1NbXGLaM6w+SXNQnmPbaeHl2 /Xd8iw5XQSbwFYm99kOADqoe6fC0N3rD77g6AmT7G01B6HZalsBn+36TiOJVaHC8wPxy RGjkM+r0730/s6V+05xiqsGGtEWauqX7Vk4pkk/uZ6ZabU581CjeD8394mNsHvws9YL1 pbyArIozi5z54un2Mitm68xbiJjCCcp8ivMlqmK4dkp0e6BwXzAI7eMi9W4EAzWzzGG0 NAWw== X-Gm-Message-State: AJcUukc2W7rP0Pya1Wzfbt+BxMQe06wlgh6OntOZvLS4L+1yW0BUFnB5 iS7aOCeP+Xt97geBAatflhQ61k6N X-Google-Smtp-Source: ALg8bN6s4A4F+fADaSOpwlvvlSUjxTQbAUMM6pTuHE8GUUdH8QXdG9C1auvVGyisNRd+hM+cA7ka5A== X-Received: by 2002:adf:9382:: with SMTP id 2mr45736350wrp.269.1549225197198; Sun, 03 Feb 2019 12:19:57 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:b082:4f91:1c1c:ad3? (p200300EA8BF1E200B0824F911C1C0AD3.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:b082:4f91:1c1c:ad3]) by smtp.googlemail.com with ESMTPSA id l20sm26048922wrb.93.2019.02.03.12.19.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Feb 2019 12:19:56 -0800 (PST) Subject: [PATCH 4/4 v2 net-next] net: phy: aquantia: replace magic numbers with constants From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: <6bd266f7-a5f4-e1a2-58fb-0e26f3253c28@gmail.com> Date: Sun, 3 Feb 2019 21:19:06 +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: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace magic numbers with proper constants. The original patch is from Andrew, I extended / adjusted certain parts: - Use decimal bit numbers. The datasheet uses hex bit numbers 0 .. F. - Order defines from highest to lowest bit numbers - correct some typos - add constant MDIO_AN_TX_VEND_INT_MASK2_LINK - Remove few functional improvements from the patch, they will come as a separate patch. Signed-off-by: Andrew Lunn Signed-off-by: Heiner Kallweit Reviewed-by: Andrew Lunn --- drivers/net/phy/aquantia.c | 80 +++++++++++++++++++++++++++++++------- 1 file changed, 66 insertions(+), 14 deletions(-) diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index fde437506..482004efa 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -19,6 +19,48 @@ #define PHY_ID_AQR107 0x03a1b4e0 #define PHY_ID_AQR405 0x03a1b4b0 +#define MDIO_AN_TX_VEND_STATUS1 0xc800 +#define MDIO_AN_TX_VEND_STATUS1_10BASET (0x0 << 1) +#define MDIO_AN_TX_VEND_STATUS1_100BASETX (0x1 << 1) +#define MDIO_AN_TX_VEND_STATUS1_1000BASET (0x2 << 1) +#define MDIO_AN_TX_VEND_STATUS1_10GBASET (0x3 << 1) +#define MDIO_AN_TX_VEND_STATUS1_2500BASET (0x4 << 1) +#define MDIO_AN_TX_VEND_STATUS1_5000BASET (0x5 << 1) +#define MDIO_AN_TX_VEND_STATUS1_RATE_MASK (0x7 << 1) +#define MDIO_AN_TX_VEND_STATUS1_FULL_DUPLEX BIT(0) + +#define MDIO_AN_TX_VEND_INT_STATUS2 0xcc01 + +#define MDIO_AN_TX_VEND_INT_MASK2 0xd401 +#define MDIO_AN_TX_VEND_INT_MASK2_LINK BIT(0) + +/* Vendor specific 1, MDIO_MMD_VEND1 */ +#define VEND1_GLOBAL_INT_STD_STATUS 0xfc00 +#define VEND1_GLOBAL_INT_VEND_STATUS 0xfc01 + +#define VEND1_GLOBAL_INT_STD_MASK 0xff00 +#define VEND1_GLOBAL_INT_STD_MASK_PMA1 BIT(15) +#define VEND1_GLOBAL_INT_STD_MASK_PMA2 BIT(14) +#define VEND1_GLOBAL_INT_STD_MASK_PCS1 BIT(13) +#define VEND1_GLOBAL_INT_STD_MASK_PCS2 BIT(12) +#define VEND1_GLOBAL_INT_STD_MASK_PCS3 BIT(11) +#define VEND1_GLOBAL_INT_STD_MASK_PHY_XS1 BIT(10) +#define VEND1_GLOBAL_INT_STD_MASK_PHY_XS2 BIT(9) +#define VEND1_GLOBAL_INT_STD_MASK_AN1 BIT(8) +#define VEND1_GLOBAL_INT_STD_MASK_AN2 BIT(7) +#define VEND1_GLOBAL_INT_STD_MASK_GBE BIT(6) +#define VEND1_GLOBAL_INT_STD_MASK_ALL BIT(0) + +#define VEND1_GLOBAL_INT_VEND_MASK 0xff01 +#define VEND1_GLOBAL_INT_VEND_MASK_PMA BIT(15) +#define VEND1_GLOBAL_INT_VEND_MASK_PCS BIT(14) +#define VEND1_GLOBAL_INT_VEND_MASK_PHY_XS BIT(13) +#define VEND1_GLOBAL_INT_VEND_MASK_AN BIT(12) +#define VEND1_GLOBAL_INT_VEND_MASK_GBE BIT(11) +#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL1 BIT(2) +#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1) +#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0) + static int aqr_config_aneg(struct phy_device *phydev) { linkmode_copy(phydev->supported, phy_10gbit_features); @@ -32,25 +74,35 @@ static int aqr_config_intr(struct phy_device *phydev) int err; if (phydev->interrupts == PHY_INTERRUPT_ENABLED) { - err = phy_write_mmd(phydev, MDIO_MMD_AN, 0xd401, 1); + err = phy_write_mmd(phydev, MDIO_MMD_AN, + MDIO_AN_TX_VEND_INT_MASK2, + MDIO_AN_TX_VEND_INT_MASK2_LINK); if (err < 0) return err; - err = phy_write_mmd(phydev, MDIO_MMD_VEND1, 0xff00, 1); + err = phy_write_mmd(phydev, MDIO_MMD_VEND1, + VEND1_GLOBAL_INT_STD_MASK, + VEND1_GLOBAL_INT_STD_MASK_ALL); if (err < 0) return err; - err = phy_write_mmd(phydev, MDIO_MMD_VEND1, 0xff01, 0x1001); + err = phy_write_mmd(phydev, MDIO_MMD_VEND1, + VEND1_GLOBAL_INT_VEND_MASK, + VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 | + VEND1_GLOBAL_INT_VEND_MASK_AN); } else { - err = phy_write_mmd(phydev, MDIO_MMD_AN, 0xd401, 0); + err = phy_write_mmd(phydev, MDIO_MMD_AN, + MDIO_AN_TX_VEND_INT_MASK2, 0); if (err < 0) return err; - err = phy_write_mmd(phydev, MDIO_MMD_VEND1, 0xff00, 0); + err = phy_write_mmd(phydev, MDIO_MMD_VEND1, + VEND1_GLOBAL_INT_STD_MASK, 0); if (err < 0) return err; - err = phy_write_mmd(phydev, MDIO_MMD_VEND1, 0xff01, 0); + err = phy_write_mmd(phydev, MDIO_MMD_VEND1, + VEND1_GLOBAL_INT_VEND_MASK, 0); } return err; @@ -60,7 +112,8 @@ static int aqr_ack_interrupt(struct phy_device *phydev) { int reg; - reg = phy_read_mmd(phydev, MDIO_MMD_AN, 0xcc01); + reg = phy_read_mmd(phydev, MDIO_MMD_AN, + MDIO_AN_TX_VEND_INT_STATUS2); return (reg < 0) ? reg : 0; } @@ -75,21 +128,20 @@ static int aqr_read_status(struct phy_device *phydev) else phydev->link = 0; - reg = phy_read_mmd(phydev, MDIO_MMD_AN, 0xc800); + reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_STATUS1); mdelay(10); - reg = phy_read_mmd(phydev, MDIO_MMD_AN, 0xc800); + reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_STATUS1); - switch (reg) { - case 0x9: + switch (reg & MDIO_AN_TX_VEND_STATUS1_RATE_MASK) { + case MDIO_AN_TX_VEND_STATUS1_2500BASET: phydev->speed = SPEED_2500; break; - case 0x5: + case MDIO_AN_TX_VEND_STATUS1_1000BASET: phydev->speed = SPEED_1000; break; - case 0x3: + case MDIO_AN_TX_VEND_STATUS1_100BASETX: phydev->speed = SPEED_100; break; - case 0x7: default: phydev->speed = SPEED_10000; break;