Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Lu Hongfei <luhongfei@vivo.com>
To:     Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        netdev@vger.kernel.org (open list:ETHERNET PHY LIBRARY),
        linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com, luhongfei@vivo.com
Subject: [PATCH] net: Replace the ternary conditional operator with min()
Date:   Tue, 30 May 2023 16:45:30 +0800
Message-Id: <20230530084531.7354-1-luhongfei@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IfS3s8dmQTGO8r1unO1KnVwL0d1/P8WqZ2azTwyCIXvrJjDKJ22WOkOAilkG?=
 =?us-ascii?Q?JGocIixhrJlEk+5FL7q0EygRCQ8tV94/YyfAkw0A8kqyMQSnS6PbhAoOwdtB?=
 =?us-ascii?Q?V3Wce8vSSdUQ/mJGEBiM2Avcrg13K/fi5w6Qnc0cMCafmLDqu301EVCOvPt3?=
 =?us-ascii?Q?WG35JceSCV5kOZ9zdqDURXoi54AzhLA1TMfjZs7uyqWlajtJD3sBOSZ+iLHX?=
 =?us-ascii?Q?6gWpg/2REs/YeAl4G+kMacBjZP/EJCtkyw/HiOfVfgvZpvUgpnG8K/srn2/A?=
 =?us-ascii?Q?NFl/1HQjUtgBZMkIo3JZYKebKOmWRHNGef55NAx6LroxZWQ01w1zvXHleVHN?=
 =?us-ascii?Q?xTJ93bTyimRaigls53QeHfbO6iquYBXd4q0Y24YakPa3BIlthBx1M0UTPOH4?=
 =?us-ascii?Q?vYjJHkL/AJNP1pX6FRv5M4pIDaG8WX9s0gwh4G068f/vFOTWdR5GAypRrdqJ?=
 =?us-ascii?Q?8RGDsJdfOoiYUf8l/oAPmxuTCmq8XapOhljsRZcF+FVPkyX/rpqRJVtSVfgY?=
 =?us-ascii?Q?Cmz8uFduybay8MrqzdTl/EisPbwUAt5WqS7RVlM7oKR+iEQ9g6EHQiY8lOvb?=
 =?us-ascii?Q?8J34ShmzIiTG2kQffq+FpWYcDQ4MQs5GnyLr0QibsTqgy1u6kBPoOtZmzQqi?=
 =?us-ascii?Q?7Lp0iQQof5shYQMFsB+kwWENVwWm98r58Gcc1Jmfw5SpOjcysAvZpFtIu71c?=
 =?us-ascii?Q?gbMtQYGLzBY9NkCgYYZOoaKzwUrh4RUe5frIhDiI8bRu+SuaR/OlUU5NDW/p?=
 =?us-ascii?Q?Y7KS+WCbgFw3nJ6H/7yJ4jjh3A9Wb2oEivj8s+Q7I0KMMzoj8Yq6f/s4m9S3?=
 =?us-ascii?Q?ja3gmtOSValIapGkizxjQZdi40iW2uxRstryrO+76GaBlH+xKffMXKu2GNCW?=
 =?us-ascii?Q?PB7DEodI9WYY1qYdKZY0aESSB0U4jH+Z1mdaXNlWUnb1YQFRuEaiWafFwl9J?=
 =?us-ascii?Q?MMRCQ9vUjQcl4kqHtAOqSU5RsKEQLeALzMBoG0xC6p1iWh7vX1ukTPJeTLGx?=
 =?us-ascii?Q?O7sL81TIHNmtiCRQDN1foiCi+dxdesxbNdF/O/E87s9yYNuLDHyOngfoQCil?=
 =?us-ascii?Q?IsK3o06Zm5IayJlBKk29hXyodowJCPG37k6SLu88xMRUzzEv1k5hlHlFc9g5?=
 =?us-ascii?Q?rsB+AIJ7+aiuOXfW6d66Echec9wKpxv578C3W6mPXZPL7tv7+BWSDgiP/r3k?=
 =?us-ascii?Q?KPrwQMXD4JITkrkVtLKg5YDnk7VEvwkz6DtTSkErrdm1GAGNKZhkCGfsErqC?=
 =?us-ascii?Q?3eKPqCG3OCSPIRt02M2zK129M0J46UXta90XvE9TZoO1UF08fpFA3DR0h8cr?=
 =?us-ascii?Q?hBRx253zc97lon1MOfb+QqPaVhq8nUe3dYY05OGx4Yh8t5ytt4QllIbHTJ9G?=
 =?us-ascii?Q?teYt2XRECyD54GGrrUhgzJUCEU1Q7VxuaqOKk8hldrlQ9QnVGSHSWVo5qbwI?=
 =?us-ascii?Q?r5a/E3PLVaZ3WuShKKuUtDCXisqPJzIEhDgG2L2tU1kAwdQwSpfqzMP+p+eR?=
 =?us-ascii?Q?9OuUAW0kvlTKWPCp5J92Ap+Ifcp4Sg+zlyQUoFssWVfL+0dDu4EXpFz6/Iw1?=
 =?us-ascii?Q?H7famWKhJmX3tHORjg20rgEwXLuLPpt+7Qi8Aos1?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 26689f37-ce37-4767-2787-08db60ea4360
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB6697.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2023 08:45:47.4045
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: mTEhkT4vb2jpiuQ13cFeYSPvVL1rJ7cT2jbAKN1enaKwBGZSO654Jp8YTsYIR+imxZnqppOKYwfAzGk+1mmXQA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB5326
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

It would be better to replace the traditional ternary conditional
operator with min()

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
---
 drivers/net/phy/phy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 drivers/net/phy/phy.c

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 0c0df38cd1ab..a8beb4ab8451
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -1002,7 +1002,7 @@ static int phy_poll_aneg_done(struct phy_device *phydev)
 	if (!ret)
 		return -ETIMEDOUT;
 
-	return ret < 0 ? ret : 0;
+	return min(ret, 0);
 }
 
 int phy_ethtool_ksettings_set(struct phy_device *phydev,
@@ -1526,7 +1526,7 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable)
 		ret = phy_set_bits_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1,
 				       MDIO_PCS_CTRL1_CLKSTOP_EN);
 
-	return ret < 0 ? ret : 0;
+	return min(ret, 0);
 }
 EXPORT_SYMBOL(phy_init_eee);
 
-- 
2.39.0