From patchwork Mon Jun 29 13:12:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Edich X-Patchwork-Id: 1319037 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=lo7cstvo; dkim=pass (1024-bit key; unprotected) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-microchiptechnology-onmicrosoft-com header.b=F3dUU0Cw; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49wcZC235Wz9sPF for ; Tue, 30 Jun 2020 05:12:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730999AbgF2TMe (ORCPT ); Mon, 29 Jun 2020 15:12:34 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:33144 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729033AbgF2TMa (ORCPT ); Mon, 29 Jun 2020 15:12:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593457951; x=1624993951; h=from:to:cc:subject:date:message-id:content-id: content-transfer-encoding:mime-version; bh=WqqlsqVGUlQFbnB/zA6GJXpqmsxIwhb2IUVWWqpwbb8=; b=lo7cstvofprA/IQsgQ7Rqkkdya2Ht7fiXJ4xUnqVTEsNMEWbUCVo3rJK HTrTxF6DGtmeHkhmnYBhwNNixSaYAnWlFHHLXxsFQhDj6hHc7FLuKIkHH /lH/e+HWjSoKooHqjTaAsmuXcN/ywCY/BVquKU1zC7Vspa4fvZuROLmVI NPIdIkAjmPPivPE0Zj/KXLmMCdpOUnqOe/ZgiZb54lwKKEwqOiptStJXB hbvJ2g3lsAVRlS3VUHvWM2/zhDqEx8edJ5YdPZgiZBxDIhYfQ9dsw9W1O YrRVwnq6LTx4mHNrFm7beDSBUhBPbF4k5c4u+OOPzuvq6cHYTn1qoLvzM w==; IronPort-SDR: C+ny2zeQN3bIipuDlmq2zSXNwaPqfwiXO/InxcXUc5wLS1ZQ1DDl9SJ7PSlCq9XGa2/5xE2vAo K7p3tLZcfbXE//dZdwNzkwexrk6NSHeq++cJ2/0fCNZSTBeg/PkX9jrLs6Q0ob5KD/VFkLbax4 L+kUORhXEsuxxqcGlisOHA8aHbuRHO/GNkx5wIIaQe0/AOtnD+LTvpF0ZtSfLtI0OXCevplAGC wHmfg97RkfjkBStzh1SINWhVVGy5gpR6QjXh+DAH2EYjqjudE1p3vMUwgHrbC5xKiRL0MNt/RF OB0= X-IronPort-AV: E=Sophos;i="5.75,294,1589266800"; d="scan'208";a="81221205" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 29 Jun 2020 06:12:49 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Mon, 29 Jun 2020 06:12:30 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3 via Frontend Transport; Mon, 29 Jun 2020 06:12:48 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HXRhsfkBay8CMBVWHTNDyjg4xR7gyV9hgEdH3glAplg4hi1h4CiVQRyXGsAQYHRbQkSmv3hJcHLDsR0b89dlI5u5JsoVCKApsAVI0ST3Cm77ozEcMcfNx2HurrHxVhoA0ECclE4Czbx2SFHTiI+oHCOdl4W0fJa0KH+Qi6OglM6HR7eEZNG34tn+SGrG2MtjBn56S4yLkF4RsECATBhDjQhyAat27RGHPcFSVPkSKuoFHR9E9F9lJ4lzmfn4Ke70X14gmGVW8sZeV+nxhFTfrF44Nt2oJCZIieaGOpvVDQ2tynjmoThJin9YKqGgoUHNMNLSav992RuF+nlK8PYL4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WqqlsqVGUlQFbnB/zA6GJXpqmsxIwhb2IUVWWqpwbb8=; b=fUl3RxmaLvyV8HjnYRqENS/6nVCu1OZN3OMX54ixUflLIp61/wtdMkoocKBdZtzwLznEovnwe3LUgre0vUxlxMicLROfYah7ZFyP+WYaf+CLHoW+HXa10HvDluapqFGbWRiD2LnYgOmirXo86Wp3P/3hx669Cwi8O+WefK2ds2dltze6QPK+WPYs1odWg2o/rBu0Biw4GKgc5XOa4jdjarPFWdvQ6cLTNI/H3XV08V9iuDX++3Bae1DBojtkwfa2cWi9XeBUelyEfEC5+tMv+85vznFP2eihfM6Ji8BboI9bEILSa780auIQ+BFLgVW0CXRYT0lETylQndjZyCHGgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WqqlsqVGUlQFbnB/zA6GJXpqmsxIwhb2IUVWWqpwbb8=; b=F3dUU0CwwC7F51lv32dCj+xmyu89hyy8mdqPwcLQp5IMu7nJACCgBcwUZgfmv5ZIU7MQ5LHt+Fpcnkm0JYB8gWBT5xXS4NfmM1gmW3gLTAvy5RsfNtfXXVMgX5mBXoEZGT6hr0oHEvNqU847iZ3t29XfVs1ZZ8NpkENhuBsXB4M= Received: from BY5PR11MB3927.namprd11.prod.outlook.com (2603:10b6:a03:186::21) by BY5PR11MB4434.namprd11.prod.outlook.com (2603:10b6:a03:1c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.20; Mon, 29 Jun 2020 13:12:46 +0000 Received: from BY5PR11MB3927.namprd11.prod.outlook.com ([fe80::5993:d0ac:9849:d311]) by BY5PR11MB3927.namprd11.prod.outlook.com ([fe80::5993:d0ac:9849:d311%7]) with mapi id 15.20.3131.027; Mon, 29 Jun 2020 13:12:46 +0000 From: To: , , CC: Subject: [PATCH net-next 6/8] smsc95xx: remove redundant function arguments Thread-Topic: [PATCH net-next 6/8] smsc95xx: remove redundant function arguments Thread-Index: AQHWThb7fjPAL7m+hU2iEbb+aJyzpw== Date: Mon, 29 Jun 2020 13:12:46 +0000 Message-ID: <2f887d706ae816eb1b018452cc50001557599825.camel@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Evolution 3.36.3 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-originating-ip: [93.202.178.57] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9125e6c3-e4c8-40bd-8f18-08d81c2e1da3 x-ms-traffictypediagnostic: BY5PR11MB4434: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-bypassexternaltag: True x-ms-oob-tlc-oobclassifiers: OLM:1013; x-forefront-prvs: 044968D9E1 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ISyfKOBonYsd/1oT47rxm91gs6Awxi+2wem9tD6G0GKQM6HFS9O3SiiQvqAdkZOQHFQsMwXB6ZIMgMTIrA8KUEkQ1vlcrTCbbUH2OUsw+7cehCmi8d5Bw4L0cvHm9uQoyndsudJyfFBiZ1nZu0zkWi65+HsgI7jaLAzH0ju3MmSJg2LXPTJdXsCh0Uua884nC3l2k9SUD/DoGZwmlWnz1XDxPy9aYAcUKlOM5VhDqJBV/a3q5XDhSGj7mN8oh5+kGE4VRnuRG4c1AE+rPWrqPnShkb5FDludXHyPCZonfaj9+r1NhNvxzs06AGZuOjLy x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR11MB3927.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(396003)(366004)(136003)(39860400002)(346002)(376002)(83380400001)(6512007)(8676002)(8936002)(5660300002)(36756003)(110136005)(4326008)(316002)(2906002)(6486002)(107886003)(66946007)(6506007)(2616005)(76116006)(91956017)(66476007)(66556008)(64756008)(66446008)(186003)(26005)(478600001)(86362001)(71200400001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: jdhJisAnqok9YTfaH1TsQPwDv2GKAhISZm3kJDhSw6clt14v2w0UNnCxX53C9dwVhP/FRnRkUcbJeYaw8V83F3kl+VRg8iIkfV765zKcyRBY59+x2dIpUq/lsRnqLPGVjBGbYwF2glWOpVsiOCFcSgtJUQ2+T5iQGDR8dRJ6pS5hwL4GqOz9k1coBj3tcjs7y/I03GTUEAdXHeP5mqL/52yFNcQuCD9iy8N2NaW2ZbOO7XmZF1rcTSnIXowVGJJ1235kvpPBBrX1R4aDFJmSbDhviicwUYPH20BwBvwhG5FkYsim+MM59wuWM869G1ahAeOsJ+0lWaQ9d61CHMvDzmf8SMzYEzBs9ApfFpebqQZNd1Hrb6IJiYNbechuk47ksxcdybU2ZDGTH9bMFTRb0j/WRwMLSBeNEeegYWTM3QoaWRCEkbYhwjLMiD21FaI3k+S6iYWmetBkOKfWRBEIm/sJG2ZT4wovekoExyq5yj9qgXpH9vV9LKabnzDaV2Z7 Content-ID: <57C6B2FBCBE3D745BD1E7145800EA962@namprd11.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR11MB3927.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9125e6c3-e4c8-40bd-8f18-08d81c2e1da3 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jun 2020 13:12:46.2257 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: xeBgMGgsF/dVMUJv68zOLm6SHFHFwDs0izYwbru638pUm5XmsrDVv+IHiTDFVocHDZOGT9xNTrquCAE4jqQsqUwQ1ddp96DNeMdVtvBBSQo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4434 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch removes arguments netdev and phy_id from the functions smsc95xx_mdio_read_nopm and smsc95xx_mdio_write_nopm. Both removed arguments are recovered from a new argument `struct usbnet *dev`. Signed-off-by: Andre Edich --- drivers/net/usb/smsc95xx.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) + __smsc95xx_mdio_write(dev->net, mii->phy_id, idx, regval, 1); } static int smsc95xx_mdio_read(struct net_device *netdev, int phy_id, int idx) @@ -1349,39 +1351,37 @@ static u32 smsc_crc(const u8 *buffer, size_t len, int filter) static int smsc95xx_enable_phy_wakeup_interrupts(struct usbnet *dev, u16 mask) { - struct mii_if_info *mii = &dev->mii; int ret; netdev_dbg(dev->net, "enabling PHY wakeup interrupts\n"); /* read to clear */ - ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_SRC); + ret = smsc95xx_mdio_read_nopm(dev, PHY_INT_SRC); if (ret < 0) return ret; /* enable interrupt source */ - ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_MASK); + ret = smsc95xx_mdio_read_nopm(dev, PHY_INT_MASK); if (ret < 0) return ret; ret |= mask; - smsc95xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_INT_MASK, ret); + smsc95xx_mdio_write_nopm(dev, PHY_INT_MASK, ret); return 0; } static int smsc95xx_link_ok_nopm(struct usbnet *dev) { - struct mii_if_info *mii = &dev->mii; int ret; /* first, a dummy read, needed to latch some MII phys */ - ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR); + ret = smsc95xx_mdio_read_nopm(dev, MII_BMSR); if (ret < 0) return ret; - ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR); + ret = smsc95xx_mdio_read_nopm(dev, MII_BMSR); if (ret < 0) return ret; @@ -1430,7 +1430,6 @@ static int smsc95xx_enter_suspend0(struct usbnet *dev) static int smsc95xx_enter_suspend1(struct usbnet *dev) { struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev- >data[0]); - struct mii_if_info *mii = &dev->mii; u32 val; int ret; @@ -1438,17 +1437,17 @@ static int smsc95xx_enter_suspend1(struct usbnet *dev) * compatibility with non-standard link partners */ if (pdata->features & FEATURE_PHY_NLP_CROSSOVER) - smsc95xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_EDP D_CONFIG, - PHY_EDPD_CONFIG_DEFAULT); + smsc95xx_mdio_write_nopm(dev, PHY_EDPD_CONFIG, + PHY_EDPD_CONFIG_DEFAULT); /* enable energy detect power-down mode */ - ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_MODE_CTRL_STS); + ret = smsc95xx_mdio_read_nopm(dev, PHY_MODE_CTRL_STS); if (ret < 0) return ret; ret |= MODE_CTRL_STS_EDPWRDOWN_; - smsc95xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_MODE_CTRL_STS, ret); + smsc95xx_mdio_write_nopm(dev, PHY_MODE_CTRL_STS, ret); /* enter SUSPEND1 mode */ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val); diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 11af5d5ece60..bcdd7e726f5b 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -261,16 +261,18 @@ static void __smsc95xx_mdio_write(struct net_device *netdev, int phy_id, mutex_unlock(&dev->phy_mutex); } -static int smsc95xx_mdio_read_nopm(struct net_device *netdev, int phy_id, - int idx) +static int smsc95xx_mdio_read_nopm(struct usbnet *dev, int idx) { - return __smsc95xx_mdio_read(netdev, phy_id, idx, 1); + struct mii_if_info *mii = &dev->mii; + + return __smsc95xx_mdio_read(dev->net, mii->phy_id, idx, 1); } -static void smsc95xx_mdio_write_nopm(struct net_device *netdev, int phy_id, - int idx, int regval) +static void smsc95xx_mdio_write_nopm(struct usbnet *dev, int idx, int regval) { - __smsc95xx_mdio_write(netdev, phy_id, idx, regval, 1); + struct mii_if_info *mii = &dev->mii; +