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 996BBC282DA for ; Sun, 3 Feb 2019 19:36:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62DFC21773 for ; Sun, 3 Feb 2019 19:36:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FUqIb2Z9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727804AbfBCTgN (ORCPT ); Sun, 3 Feb 2019 14:36:13 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:37303 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726784AbfBCTgM (ORCPT ); Sun, 3 Feb 2019 14:36:12 -0500 Received: by mail-wm1-f65.google.com with SMTP id g67so11183414wmd.2 for ; Sun, 03 Feb 2019 11:36:11 -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=8sdR1a0xP2ZkQlifwR7ZZdKXVgqaQMBnCNWFqidBUPw=; b=FUqIb2Z9+0m2EeoRMeehIV5iaQNLDL/NhQzaw+oP4kcCK3jNvRuCrOQ0bw1OSeXFY7 a7GFFJcAUDA+KqtTEdEWu990HZMn+8fetaiOpkBaAPIvjowqjhekcg6Btvh2lOCvy4DB TXd43/7i7GiL6bXy2BDv3UZUSPH9sffFrx7aznesdoZg4zuk9RMdmxUrFUKrv0jcigLh hWNH7eIvWcSj/KXzpBv/6TexANORVchD8Rbgoeg9vx2c4/Yh4nGPnGQVwnO3KqHxCwXi UMWS/vHqdvYqz0nqUl+FDvEeo9bNp5gTifipNUsFe53QonTxqQk9rA2u7PYX3hHgA8cS iinQ== 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=8sdR1a0xP2ZkQlifwR7ZZdKXVgqaQMBnCNWFqidBUPw=; b=qEFfI69P0pjjtVF6uCy687Ir8UsQaCXR0FlNuIVb146gs6QbXrDSwRn4hBHbNkrpkL 9YbW3asOuLYylQUyVqPzZETFPJWdOv6cJNsfJjmfHGqRdqVUYeA/OLksMzKqJuI0tZWR ky9OG6q41ymSqrKP8PoVw8jVr5N7+JLOOb+iYgc+XIaNgPELFcC7wLODexL7gu64FXkQ GEBEOWT1zq+1NGet+n5XElGN27tIcCdmOdxv6+FYMK1gkZrCMUL/f+eP9T648gVQtxgj i/eomL7zS7qil9xqp1aaLuEYno6WhC78ilMx6+6gkohmnT99bkq7OA8gbxUJJorcNA21 Id3Q== X-Gm-Message-State: AHQUAubkmwHufb7pZt08+UpvmGud/njH3EEV5/c0EMqw7YasTQM4HNnM ik2P+G2DvZkWUnXLXHIgMVkBUKcm X-Google-Smtp-Source: AHgI3IYFIJWvqR+OIaqg5fo8ygRctEy80LWtjqqPI9bEt8XxDgLSmXoO12WI8Dmw9eeHRfEL5GOBqg== X-Received: by 2002:a1c:a6c2:: with SMTP id p185mr9549490wme.133.1549222570087; Sun, 03 Feb 2019 11:36:10 -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 v22sm253056wml.37.2019.02.03.11.36.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Feb 2019 11:36:09 -0800 (PST) Subject: [PATCH 3/4 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: <08812313-471b-79c2-f667-bace78acf0fe@gmail.com> Message-ID: Date: Sun, 3 Feb 2019 20:34:37 +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 Make use of macro PHY_ID_MATCH_MODEL to simplify the code. Signed-off-by: Heiner Kallweit --- 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 8a51589a3..12874cce4 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -100,8 +100,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, @@ -111,8 +110,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, @@ -122,8 +120,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, @@ -133,8 +130,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, @@ -144,8 +140,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, @@ -155,8 +150,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, @@ -170,12 +164,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) }, { } }; -- 2.20.1