From patchwork Mon Jun 29 20:01:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Edich X-Patchwork-Id: 1319132 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=bYNJWfLN; 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=Ew/x418P; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49wdgd348vz9sVf for ; Tue, 30 Jun 2020 06:02:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388578AbgF2UCU (ORCPT ); Mon, 29 Jun 2020 16:02:20 -0400 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:16407 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388667AbgF2UCN (ORCPT ); Mon, 29 Jun 2020 16:02:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593460933; x=1624996933; h=from:to:cc:subject:date:message-id:content-id: content-transfer-encoding:mime-version; bh=6Yk2j93aPXLkxHLvZSIdkPSi0wIJF5w+CZkl5etb3CY=; b=bYNJWfLNMWMbtr6uokjngxZA93jwFW+P1nOHaZw3RjlQEGOoKL3gdwOD cwOgOavXC/F1mPTu7va1tic9u+vbYPLZoTKmP75TZLMk7dJ/h68CfhlJM FvPp1O2TAF/bkQTvsp6BmNu70gMHGts4ruHqM+C4W7p7+SBd9GTRTL5Ej CmwOwYD9PiilouWi8fgUeO9Hc9qVoOueA6qRu+xBZ3vBwpVi/SHe0gmHW HMQ6uWNylJwDHkfCQjuCB8N/CC0H16Mtm6oiXN9o4U3n4PKgJuswiqZvx +y2OIsprycfaQS+WNICeHZItox1ioMCBKdt9uqDaXJNO0B/rN6s9AAXe7 Q==; IronPort-SDR: Jg3TUQ5mcfqAHHUStYH2KX4axa9JQUdd/LP/JJ/KVRjiD1yr2poMzuAUGYENL1TOXdQLGOWVfV LU3dMM7spfAVatYcuznt5oix6DpTAdrzLbfJILecTUTR7t4Y4BmK6p4GdCeD/PRAWYcHqPT8AN ZHlAj607wg+hcuYPhF92i5BcD3Ydm5KL6w0kW3H43dcyIDqo5bLmaKFR/u0H5RWOu3pGINIJ1R oYr3E4TGaqpwVmietZJVC5mJGECNnQysTSm+dWYfR/Uz+Cv+4gFmcFZXeR+3iD/jCT7CwTGnUA YHc= X-IronPort-AV: E=Sophos;i="5.75,295,1589266800"; d="scan'208";a="85542667" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 29 Jun 2020 13:02:02 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) 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 13:02:02 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.71) 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 13:01:45 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iaev62zVW4MGJFIA2WtuVQP5D7vwVlp4qij56DCUisg1u8QdjimT0sD7HMH+T9QNBCXOc42ThPFjok576U19kwTptECZRtyirV+CHcriKjrnud37bsLk/jNSF3S8EbFWNrLT76TPJsZtj0TcfBjZXmqHoguKqjfY2HzCNwbLgpPdIGWZEnUMZu4z39d224wcxBI9rcgBhrzo6GyhzzFl+HMmFiAkruCis7Yf0bR1SjT0MI1D1rSYl2aUFDqmz+/Lb4fBENXVm2xe7IL3tayiJTdFPCYiv47eWMXVRpdxBGEV04C5fPZmLqa6kEModsfhJNS9LuU6ZniN39vwgPdQEw== 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=6Yk2j93aPXLkxHLvZSIdkPSi0wIJF5w+CZkl5etb3CY=; b=TQpsoPtiVxDFd0tpNvkegHAsMHw468+suYPKfRDHGh3hBZlxBE/znsRhXvShYipIgD1Kzmu5rdD2MDkkQ9UQNnAgbS/s2Qp9McQXrxVl62r02+TLZ085sairXpCgVGEVxSKxuAi/OyPBOTkR9pR1KTkpj/Mi14yaj0SCX/E/OM9WRfABQzMP9/H4WjqiL5YrK2BXUpNJvoVkbXo4mG4bH39QXkumJkTaoO5quYje76aUZNxdoi1fWoB/DuVw1+bK0y4Hn+1tEh364kABjiCliXDknf7LilWJ/GDnUt7FbknQY2caYHolfLdb1/Ap1S0rCzmanelTRHTDSpWFvxs49w== 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=6Yk2j93aPXLkxHLvZSIdkPSi0wIJF5w+CZkl5etb3CY=; b=Ew/x418Px91i+x2iyURhLzbPEAPmieTmhaLDowvubyy9rhk8coAJMziY7PotuPARSeEroNpe919N+pfvFcIkUgoJSafXNtBI0kiXr5l/VPRPbw4c4AkMxEHTF7FyhNl8pxkhTw7LEKVECb8w41ESr5uV0awxMRWuonJQgCFTIeg= Received: from BY5PR11MB3927.namprd11.prod.outlook.com (2603:10b6:a03:186::21) by BYAPR11MB2792.namprd11.prod.outlook.com (2603:10b6:a02:c3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.24; Mon, 29 Jun 2020 20:02:00 +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 20:02:00 +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: AQHWTlAmSCPxEOFjiEqoQ4nggvYMnQ== Date: Mon, 29 Jun 2020 20:01:59 +0000 Message-ID: <43615c318e057a87ceab45e0807c3dd8e041eb49.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: 92a611fa-f7a6-4c30-1ec7-08d81c6748d1 x-ms-traffictypediagnostic: BYAPR11MB2792: 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: 5UIL9QZhUrr863OVG/9cFN+EkpWm+546AjfLSxxwon3W1UEmNjRTa1DGdR92VV5/c8NsJRuLdxPbYL1Gii+UMxAtOnDFTxQ9kJ+dgg4ETOrqd4/1UR2CGXjzRlYI8alRcPvJpQ1Zl+OkKK8AJpFNKkiqhu/jDKNKDm7WqMaXmzojd11my0OStCy3iYMYNuecTlsu0PtSNQY2bEOrHAziORNHqBDVLJKgkDsDAux6wRMzbfIWD32VzhBwv/w7j4YRCPkoKFe/hXCklo9vhmy/0YOLNZrLO+QqDSLyTBL1s/updTnq4lXa3BBq4/zfVdk9 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:(366004)(376002)(346002)(396003)(136003)(39860400002)(6506007)(4326008)(110136005)(478600001)(2616005)(2906002)(8676002)(316002)(8936002)(36756003)(6512007)(186003)(86362001)(83380400001)(71200400001)(26005)(6486002)(76116006)(107886003)(91956017)(5660300002)(66446008)(64756008)(66946007)(66556008)(66476007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: +Zo4QNN5u7NBnt454CgLzR9/kvov/KAzt5fuaAGe8vaqURbv3M32VESxUAevjpaD0oaZnmrJIBqxupoBPlX5H54FApNxnAMtjK926jep4PsUgh6VxoiC/lpv9MgZTnbuVYq5hT28s2EgPByKFWUFJrtPWbkMffJb4ILJrUYJVg/V7kR52sWfvfYSg95lHQT+0X77t8oye8cCqz4+bBtVVw5TJsB3OQcEauU0UL/XYpSRZM3yPQZ7nSvuP4tGBm0JfUqJ+Kh92yH9WH0K2tVx8baLcEgYJ+WgCtpSbxS8JZDQVHw+6+p0zIMzAwJi4uDQTiVrSrTQKl3366NjolCO635wH9vw7Bgm3X7Pih5iDf//I8y5Qnt0iVE9EcKTDLZ3NEh/uWLAavM1RdVbqjqeWzJDvURRPvsIBSoRlek2MQO/aRfUP6SjyRc+gDNT0hkZ9+J4LAJBWVoZpe0s8v4S1a1QaIilYwyRghIsrPWhKUyPvVA1kUH0KNz0THqtzK4m Content-ID: 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: 92a611fa-f7a6-4c30-1ec7-08d81c6748d1 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jun 2020 20:01:59.9390 (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: GB3k0dDaon/DR729XoEBpV5wIwEwqaGZKRaT7/SWarqIKpFevQgCHRvrxGmWldm4Nf79FoZP+tVCAK2sxftwTpRIQriYYBQbKu5jmVhg4/s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2792 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; +