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 83681C169C4 for ; Sun, 3 Feb 2019 20:20:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51AFB20821 for ; Sun, 3 Feb 2019 20:20:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GNQ8w/02" 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-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 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) }, { } }; -- 2.20.1