From patchwork Thu Feb 7 07:22:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800493 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DB0B313A4 for ; Thu, 7 Feb 2019 07:22:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C26F82C800 for ; Thu, 7 Feb 2019 07:22:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B66AC2C95B; Thu, 7 Feb 2019 07:22:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 624A32C800 for ; Thu, 7 Feb 2019 07:22:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726579AbfBGHWY (ORCPT ); Thu, 7 Feb 2019 02:22:24 -0500 Received: from esa2.microchip.iphmx.com ([68.232.149.84]:26476 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726186AbfBGHWY (ORCPT ); Thu, 7 Feb 2019 02:22:24 -0500 X-IronPort-AV: E=Sophos;i="5.58,342,1544511600"; d="scan'208";a="26238598" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 00:22:23 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.108) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 00:22:23 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YjcfACrWn7JdOdFv22iPruF8IolT/3cXElYMoZ6cAUA=; b=YVwHoVaaqjusjN1BBorGPl8zS5ouLT/kDEziClmMUR8fvz4Q8d1C6fz05nOlgMxpNPFSiur+24+EPmBPS7dHbPReoio3zR1VwLZaPPThIt1/iGBrUbukUrDqCmAuvRtbi8ayL5H/angbaikVjtzgP7+Msohi3q28H7dZ2LS01iQ= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB3415.namprd11.prod.outlook.com (20.177.224.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Thu, 7 Feb 2019 07:22:21 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 07:22:21 +0000 From: To: CC: , , , , , Subject: [PATCH 1/9] staging: wilc1000: revert fix related to vif index Thread-Topic: [PATCH 1/9] staging: wilc1000: revert fix related to vif index Thread-Index: AQHUvrXdfdwvmGoLAEustPic2coPHQ== Date: Thu, 7 Feb 2019 07:22:21 +0000 Message-ID: <1549519927-2651-2-git-send-email-ajay.kathat@microchip.com> References: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MAXPR0101CA0020.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::30) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [223.237.230.157] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB3415;6:MiyZ/mIMz5VDQ0JsBt9uZw1S3mSHITqMgYiWkSklpjr5p6e+FqIvwDu0aB+vw6f3JZ7FFabxRyGylLlpVRfLHQSendASpabmKfZbOmBz4wLCy4i8gW7XwTdavy3EhttIc+oAIhQASMS1EnfSpw021HQCMGlSeUSFdHuNMQAZh6QV6PLSZwudxb2oZg8ZuECzLindnnKLcLbOo6EF45ClVaWp4hzA6wq9PbWArF2ZxdO7eutU9z1XnYIYrql+ZVOT6NAiLiZfayVbp1tK00thUQ0e5M/7pEVZsgrYofEYg6Rm4kq70dR4LkhTZvrqBCeaC9eiAy/JCd4f4OrzcDbkevbnl/OtYPE2gpHUIb/gRoHYTlbKYfWedrnQLO9Si/aQ9LF1R4uQZRlf/Oh9tQ4CSme0+legMYtPnrfLEw1lQvAsyLN3mAthN1yhSO2XjSxyI/tN8s9413pZU46bin+eZA==;5:QYTVUidkpH41KNr3z3/LcvjuDoFnStILbKsW/w0sHSUguTWchvvi80wxd1PcCDbBFDU/tJUVVM4i7xaS4FT3QfIaW7I72q/MuamF4Yj9PDoAlwOKzAli1bBM/Q0GMY0W+yF0h+ibMhDMc30O4V8xHAKjDKF19UvdxKDMN3br+U0dYhgT9/Dl2Iab+ih0Y6hyO2LVBysROc8ifcJKegenTg==;7:Wn/ieZAGqpcuUpFXPVzgzH8ZBJzr2VjuNFfY0cOyAZiC2DHwgPqKz+8VNIbDDHTkcJp7+aFEn56EpsvLrZhGp7Z2hP2/QLclrICLpgL5o9GJue6B/C9Cp6T1BrkEzGTNjm1Dk3jWvq/K77UnDEgbFg== x-ms-office365-filtering-correlation-id: a436d0c0-050e-4858-9042-08d68cccff89 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB3415; x-ms-traffictypediagnostic: BYAPR11MB3415: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(136003)(366004)(396003)(376002)(189003)(199004)(86362001)(5640700003)(478600001)(6116002)(446003)(3846002)(72206003)(6486002)(11346002)(6436002)(25786009)(2351001)(2616005)(476003)(6512007)(105586002)(106356001)(486006)(26005)(6506007)(102836004)(386003)(36756003)(71190400001)(2501003)(97736004)(71200400001)(81156014)(305945005)(66066001)(54906003)(4326008)(186003)(68736007)(8936002)(81166006)(52116002)(50226002)(53936002)(256004)(6916009)(316002)(99286004)(14454004)(2906002)(76176011)(7736002)(8676002);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB3415;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: HliQEl4pI6steCJl6YmnGtdyIIAbnhgD3t+QR8B1BSnZf75uMrJHauLEaz5s5QFVDyCbxWl6yfe6paAYJTdskgVUmmmZ0+p61rI0GK5/UPR8k+3H3cVc9jWFSZLLLLZJekz95K21uZD1p6oqEeGWJg/+W+HF7jPJ6nH2xhAiV7w6/Hgn8ctzyjDeu0eVnwJAwtB1GIhI2uWO83RghX/n4T2pY82x+fgNRGtdUmjtHngMiAN6kObMtkF+mwKhc/b7lGvauQn74O7nYjNg+orLiWXR9JxJUTH48Eb6uamTuwZkmBXro+7zd4ThayJmWZzaLqILkOSOgMvOT9vtUldH8VhcQMxjk8j1c1HrXSkL+tJV5/tV9+Hd7UkodhvvyqbpLUeyH5GU48o7IZLqvcUN9kKjpdhf+IxBlMidmRyr4k4= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: a436d0c0-050e-4858-9042-08d68cccff89 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 07:22:18.1207 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3415 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh This patch reverts 0e490657c721 ("staging: wilc1000: Fix problem with wrong vif index") commit. The issue was not completely fixed with the above commit. After 'for' loop completion, '->idx' value is correct but '->vif_num' still contains incorrect interface count. Fixes: 0e490657c721 ("staging: wilc1000: Fix problem with wrong vif index") Cc: # v4.12 Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/linux_wlan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index f096f9e..648b658 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1017,12 +1017,11 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, strcpy(ndev->name, "p2p%d"); vif->ifc_id = 0; } + vif->idx = wl->vif_num; vif->wilc = *wilc; vif->ndev = ndev; wl->vif[i] = vif; wl->vif_num = i; - vif->idx = wl->vif_num; - ndev->netdev_ops = &wilc_netdev_ops; wdev = wilc_create_wiphy(ndev, dev); From patchwork Thu Feb 7 07:22:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800495 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 08C8B922 for ; Thu, 7 Feb 2019 07:22:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E44282C800 for ; Thu, 7 Feb 2019 07:22:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5AD82C95B; Thu, 7 Feb 2019 07:22:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B1522C800 for ; Thu, 7 Feb 2019 07:22:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726675AbfBGHW1 (ORCPT ); Thu, 7 Feb 2019 02:22:27 -0500 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:47400 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726186AbfBGHW1 (ORCPT ); Thu, 7 Feb 2019 02:22:27 -0500 X-IronPort-AV: E=Sophos;i="5.56,564,1539673200"; d="scan'208";a="27377114" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 00:22:26 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.107) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 00:22:26 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cQ7hHlIMiXZKvfYwtgQXyp6HEeP+3c7pXr3k29PwePE=; b=nz5zLhdm99vV55ACDzS36/jPhc6rPyvM1U2WLxgBo1rweb0t1IfFzy+aPjscG6hP6qsGqg9jLR0lvGwPZ51WyJ/uSt7xe/duiZCn83UNVDzBlKDKUrUZT3d5cdyF1VJbBGWO/7dcn22LD+Zrv/bkLsGYkmoqsLmEppjYBEvAFSM= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB3415.namprd11.prod.outlook.com (20.177.224.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Thu, 7 Feb 2019 07:22:25 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 07:22:25 +0000 From: To: CC: , , , , , Subject: [PATCH 2/9] staging: wilc1000: fix to set the correct value for 'vif_num' Thread-Topic: [PATCH 2/9] staging: wilc1000: fix to set the correct value for 'vif_num' Thread-Index: AQHUvrXfydZqDAWgJk6jufREFkE89g== Date: Thu, 7 Feb 2019 07:22:25 +0000 Message-ID: <1549519927-2651-3-git-send-email-ajay.kathat@microchip.com> References: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MAXPR0101CA0020.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::30) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [223.237.230.157] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB3415;6:oNEjNroldMXPzhZDRwZb0IRA7J/1pKnpn0+zXxAoaXHuJBsySBq9I0s93psw05fccYYo6MgNCXZxNHE8hQmJ/DoD6NTpUNl4XxllOCJ2J0OijUoh+qgpd6llha4F+cvRUhcqHC/7TUcza1opC/CxtdfKhCWg6I2S32JjqoOgnduheGWRORDbMit1kynZUU0X8uVuUOOJLIpIk3nrXYTuMX5wqeI2VGNEluuRI0XUOEoX3CZwaXN1Ax8w9jxng62pSqFxnJYzRI0aCEZuLOalC98ckEaWU0SciLEjopANuy4ze/D8d3LZwoa4rL+7TdcArHoFsTkfVMQRtYznM4jazz1VTik5Y4syq2R2RCTMTl8aChdHZX5LLzZ6j9s8KYVkmNbN1SLgNK7Y4bH0IsI5X1AOBgft2qJkIRK60/lTpwsp76CQoNdgx0cAhUbklNbZhFZS5vLt+amZotB2MGPsVg==;5:Ql5lCmsHN8Aozj0n4sLzRe+s5+cbuq3ES0eMmQifwLfgqwzZuwMDDNeDhuPqCJBD3ydyKJTqqDuozu6cHoKBhLDtPF1cC37i/iIaR6kH5/FxxqF7VROMw2SayUY7pSgTcc17SuJp1uDeR2jCVbymD/9d5xzuS4441MO7/83R1Fv8E7i8VfmKPhWJBWJZJeETQuJwLfqhA3R2Mb4hfIgXCA==;7:TnBJ4vmmOtT5BJ3rw0ynYmGDp7pxBWyMU7burIRzovEJMa1HpQY0oIX0nzKdp+OMSuzlrYBCWkiqCjFiCPjXWI2+NNE9Co59Gg7PNPUMzOfS4b92SJ5HfhOqgnnXMkIhueSaoVdX2k/f5UfWS6Qekw== x-ms-office365-filtering-correlation-id: 0bce5d14-e90d-4008-e88e-08d68ccd01ab x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB3415; x-ms-traffictypediagnostic: BYAPR11MB3415: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(136003)(366004)(396003)(376002)(189003)(199004)(86362001)(5640700003)(478600001)(6116002)(446003)(3846002)(72206003)(6486002)(11346002)(6436002)(25786009)(2351001)(2616005)(476003)(6512007)(105586002)(106356001)(486006)(26005)(6506007)(102836004)(386003)(36756003)(71190400001)(2501003)(97736004)(71200400001)(81156014)(305945005)(66066001)(54906003)(4744005)(4326008)(186003)(68736007)(8936002)(81166006)(52116002)(50226002)(53936002)(256004)(6916009)(14444005)(316002)(99286004)(14454004)(2906002)(76176011)(7736002)(8676002);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB3415;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 0ObNm7FVXMY/iMErMCO8gz3r0zr7wQ2txFRfyabKeGvXsAfitXCYKKuG0MwgGSq+r1rjVix8GGhgWrPVy83Uq76u536HP54XwgMsUJ0pdXj4Iac/XNk5X2s4srf594oanCqEwT49+I8Q47nk33bjr+c/+SI5NxJifujb4u+T+lIRImBpwLtRB3govk1ZKZ7OKpPHWSZ1RGS4Q43q9YQ0DSTaWJopjkhCy9yMQgZozrTKv3zkpR1EkspJoOBVn6QQ+ctTBJw0IUQG6GrTMXgj+oS78W2/jFwlBTL0kPsDZSHEExM/mvWQ8Rziu4BFjN7ojGueP7H9j+JV4egm6Eb09H//04/UadhnaNQ9rWoxf4ttRv/vnP/7XhC2fmOSH3cbtAcwhvXMcA6mBXKspVAv5PKmqzoAlC4gb0XZIsz9l/A= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 0bce5d14-e90d-4008-e88e-08d68ccd01ab X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 07:22:21.7262 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3415 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Set correct interface count value in '->vif_num'. 'vif_num' was incorrectly set one less than total number of interfaces because 'i' is used to set its value, which starts from 0. Fixes: 735bb39ca3be ("staging: wilc1000: simplify vif[i]->ndev accesses") Cc: # v4.10 Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/linux_wlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 648b658..8fa5f90 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1021,7 +1021,7 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, vif->wilc = *wilc; vif->ndev = ndev; wl->vif[i] = vif; - wl->vif_num = i; + wl->vif_num = i + 1; ndev->netdev_ops = &wilc_netdev_ops; wdev = wilc_create_wiphy(ndev, dev); From patchwork Thu Feb 7 07:22:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800497 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69EEE922 for ; Thu, 7 Feb 2019 07:22:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F6482C800 for ; Thu, 7 Feb 2019 07:22:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4312F2C95B; Thu, 7 Feb 2019 07:22:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1007A2C800 for ; Thu, 7 Feb 2019 07:22:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726703AbfBGHWd (ORCPT ); Thu, 7 Feb 2019 02:22:33 -0500 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:47400 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726186AbfBGHWd (ORCPT ); Thu, 7 Feb 2019 02:22:33 -0500 X-IronPort-AV: E=Sophos;i="5.56,564,1539673200"; d="scan'208";a="27377118" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 00:22:31 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.105) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 00:22:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=I4ICCQWT/wydC+ychRlHjAkiSOwS/HLjstbw2+YOVXU=; b=ruHzovSKkYAtrbJoK+de9Tgh84UwFXQ6zFv5C2GxgMMuOyqdYlyzKPuJuQhNlIJk2j3mZjPMlFiHBynYb04RGmeAT4sYtR9bltqe8Ij5t21k6o9oJSdzjQ73nmycZ9wKV5rG4fuo/Rw0w/OxYiZF5ZHv2RiKy2H2uDQYFP9sCeU= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB3415.namprd11.prod.outlook.com (20.177.224.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Thu, 7 Feb 2019 07:22:29 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 07:22:29 +0000 From: To: CC: , , , , Subject: [PATCH 3/9] staging: wilc1000: add 'wilc_' prefix to have proper namespace Thread-Topic: [PATCH 3/9] staging: wilc1000: add 'wilc_' prefix to have proper namespace Thread-Index: AQHUvrXi2o/cbZnP/UqRGL9a3fX3Vw== Date: Thu, 7 Feb 2019 07:22:29 +0000 Message-ID: <1549519927-2651-4-git-send-email-ajay.kathat@microchip.com> References: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MAXPR0101CA0020.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::30) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [223.237.230.157] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB3415;6:axVn+NI4WnpC7+V+C1dcIX7/X82PZWIZZ1MzWeAwLa5Pmcyu0b8aebx2CKe6UKrEfGnV34IO99WXQYCwKsiamxGOuxZe50kryWXciMf6yFp9U3qDxIuA642D13vwgAMI08jZWFCfpLMT/FkrVSPUncUaevi7rZf64lgAyJe6vUl9Ny89FnSngZPAoXkZzloUNFCThFVXKNFP8w9DgG27P9BBfanyMZLxezVeupbyrpeol0FT4y4DLcwrTEXggqvG6uzqqBHUgNOBr6M7nG8/pmYXshdI9hLXAWHhoSFyH6kUEbOdbwR5rHRwGQ/LTyevHYM2SSzN0KWUuirZEXI3mpr5IFKjGswk0Y1hnmjOdwo87l3wHDcUrejAgb+ULzjkpXabLBqsOUoJJ5E5CQvuPssVmX5IPcPun+2X1ymg70ZFA8OND0UID8oqcSAktWwOFjj9LDvYyWVfqEY7QpRalQ==;5:xHUtSyAsCUSLsjLGXv+xErxUgQUV7MiqY0KsLAjhVAAI75M6GgwXS+y/7ta3m13wfbq3Ina7Fn2IaieaIrbIA/6SjKavTGOEsLeUqAotnY6MG3Xk8cvXCfiCEHU4suBrACI1JBV9WQW0RHqOLYovtkwO/csgctRo61C4xQgynrDZrS588386LXlgoMn8ps93W3F6uNV9cxyWaBG9lfA8Sg==;7:GLHOko5ZcK2neksSDI2pJOwNY0JLw+O1lJPkJAmQaIEFxUPsal/LpPS9G57r5sYkylY42VDx5ON4r0HJ3wKUPJojj8swrI+TajBj+SGBO/nNebTv/4Ly17qzKiNSsysv7RYQQe+GfUhzqSxJ0jylZw== x-ms-office365-filtering-correlation-id: 21881159-3635-4b50-0bf7-08d68ccd03cb x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB3415; x-ms-traffictypediagnostic: BYAPR11MB3415: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(136003)(366004)(396003)(376002)(189003)(199004)(86362001)(5640700003)(478600001)(6116002)(446003)(3846002)(72206003)(6486002)(11346002)(6436002)(25786009)(2351001)(2616005)(476003)(6512007)(105586002)(106356001)(486006)(26005)(53946003)(6506007)(102836004)(386003)(36756003)(71190400001)(30864003)(2501003)(97736004)(71200400001)(81156014)(305945005)(66066001)(54906003)(4326008)(186003)(68736007)(8936002)(81166006)(107886003)(52116002)(50226002)(53936002)(256004)(6916009)(14444005)(316002)(99286004)(14454004)(2906002)(76176011)(7736002)(8676002);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB3415;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 6s2aJ2Bmn7o7r8LypV/rhaTKA+WBMV+JkGzfP/aOwSJl+Ng8XdfOGNuRQZtG4VYyQHSSlehtlUQwgWbie/04NcD4cMKJDksDhV5TKW6rup/KUJqWV18V/hyndF26SSkxzmYnIUbLPPHS+nm5Vop1c8Cw2gGsFsOmzkf0PNlQ14vab4LUdfjpuO3/UD6+0FB5sJahyn+91yupAHdUUuNDhs+amtAf07q41HwwpsoenSPKyYLuYDCRWlWaywRnT4xfJnZKI7ugCyr4CPK00hejHvArWS4bGeQk5iPMCPDm78ZEgh4xt62RrB1U69S4NBUOz7UXWN7/35nnop24yHwYGbKjwZjoKifRr3GbvukBJKpywRhwOgqmGafqpMxwDSLTgRYfKx51/YOcLUUlvqBsTXibzqvITxCYzPeGoEU0vLw= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 21881159-3635-4b50-0bf7-08d68ccd03cb X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 07:22:25.6000 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3415 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Cleanup patch to rename data structure and function name to have 'wilc_' prefix. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/host_interface.c | 54 +++++++++++------------ drivers/staging/wilc1000/host_interface.h | 12 ++--- drivers/staging/wilc1000/wilc_spi.c | 4 +- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 22 ++++----- drivers/staging/wilc1000/wilc_wlan.c | 8 ++-- drivers/staging/wilc1000/wilc_wlan.h | 8 ++-- drivers/staging/wilc1000/wilc_wlan_cfg.c | 12 ++--- drivers/staging/wilc1000/wilc_wlan_if.h | 2 +- 8 files changed, 61 insertions(+), 61 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 0fb6ca3..9abe341 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -9,7 +9,7 @@ #define WILC_HIF_SCAN_TIMEOUT_MS 4000 #define WILC_HIF_CONNECT_TIMEOUT_MS 9500 -#define FALSE_FRMWR_CHANNEL 100 +#define WILC_FALSE_FRMWR_CHANNEL 100 struct wilc_rcvd_mac_info { u8 status; @@ -21,7 +21,7 @@ struct wilc_set_multicast { u8 *mc_list; }; -struct del_all_sta { +struct wilc_del_all_sta { u8 assoc_sta; u8 mac[WILC_MAX_NUM_STA][ETH_ALEN]; }; @@ -68,16 +68,16 @@ struct wilc_gtk_key { u8 key[0]; } __packed; -union message_body { +union wilc_message_body { struct wilc_rcvd_net_info net_info; struct wilc_rcvd_mac_info mac_info; struct wilc_set_multicast mc_info; - struct remain_ch remain_on_ch; + struct wilc_remain_ch remain_on_ch; char *data; }; struct host_if_msg { - union message_body body; + union wilc_message_body body; struct wilc_vif *vif; struct work_struct work; void (*fn)(struct work_struct *ws); @@ -110,7 +110,7 @@ struct wilc_join_bss_param { u8 bssid[ETH_ALEN]; __le16 beacon_period; u8 dtim_period; - u8 supp_rates[MAX_RATES_SUPPORTED + 1]; + u8 supp_rates[WILC_MAX_RATES_SUPPORTED + 1]; u8 wmm_cap; u8 uapsd_cap; u8 ht_capable; @@ -195,7 +195,7 @@ static int handle_scan_done(struct wilc_vif *vif, enum scan_event evt) u8 abort_running_scan; struct wid wid; struct host_if_drv *hif_drv = vif->hif_drv; - struct user_scan_req *scan_req; + struct wilc_user_scan_req *scan_req; if (evt == SCAN_EVENT_ABORTED) { abort_running_scan = 1; @@ -475,8 +475,8 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, supp_rates_ie = cfg80211_find_ie(WLAN_EID_EXT_SUPP_RATES, ies->data, ies->len); if (supp_rates_ie) { - if (supp_rates_ie[1] > (MAX_RATES_SUPPORTED - rates_len)) - param->supp_rates[0] = MAX_RATES_SUPPORTED; + if (supp_rates_ie[1] > (WILC_MAX_RATES_SUPPORTED - rates_len)) + param->supp_rates[0] = WILC_MAX_RATES_SUPPORTED; else param->supp_rates[0] += supp_rates_ie[1]; @@ -563,7 +563,7 @@ static void handle_rcvd_ntwrk_info(struct work_struct *work) { struct host_if_msg *msg = container_of(work, struct host_if_msg, work); struct wilc_rcvd_net_info *rcvd_info = &msg->body.net_info; - struct user_scan_req *scan_req = &msg->vif->hif_drv->usr_scan_req; + struct wilc_user_scan_req *scan_req = &msg->vif->hif_drv->usr_scan_req; const u8 *ch_elm; u8 *ies; int ies_len; @@ -758,7 +758,7 @@ int wilc_disconnect(struct wilc_vif *vif) { struct wid wid; struct host_if_drv *hif_drv = vif->hif_drv; - struct user_scan_req *scan_req; + struct wilc_user_scan_req *scan_req; struct wilc_conn_info *conn_info; int result; u16 dummy_reason_code = 0; @@ -911,7 +911,7 @@ static void wilc_hif_pack_sta_param(u8 *cur_byte, const u8 *mac, } static int handle_remain_on_chan(struct wilc_vif *vif, - struct remain_ch *hif_remain_ch) + struct wilc_remain_ch *hif_remain_ch) { int result; u8 remain_on_chan_flag; @@ -957,7 +957,7 @@ static void handle_listen_state_expired(struct work_struct *work) { struct host_if_msg *msg = container_of(work, struct host_if_msg, work); struct wilc_vif *vif = msg->vif; - struct remain_ch *hif_remain_ch = &msg->body.remain_on_ch; + struct wilc_remain_ch *hif_remain_ch = &msg->body.remain_on_ch; u8 remain_on_chan_flag; struct wid wid; int result; @@ -975,7 +975,7 @@ static void handle_listen_state_expired(struct work_struct *work) goto free_msg; wid.val[0] = remain_on_chan_flag; - wid.val[1] = FALSE_FRMWR_CHANNEL; + wid.val[1] = WILC_FALSE_FRMWR_CHANNEL; result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); @@ -1224,7 +1224,7 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len, u8 mode, u8 cipher_mode, u8 index) { int result = 0; - u8 t_key_len = ptk_key_len + RX_MIC_KEY_LEN + TX_MIC_KEY_LEN; + u8 t_key_len = ptk_key_len + WILC_RX_MIC_KEY_LEN + WILC_TX_MIC_KEY_LEN; if (mode == WILC_AP_MODE) { struct wid wid_list[2]; @@ -1246,11 +1246,11 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len, if (rx_mic) memcpy(&key_buf->key[ptk_key_len], rx_mic, - RX_MIC_KEY_LEN); + WILC_RX_MIC_KEY_LEN); if (tx_mic) - memcpy(&key_buf->key[ptk_key_len + RX_MIC_KEY_LEN], - tx_mic, TX_MIC_KEY_LEN); + memcpy(&key_buf->key[ptk_key_len + WILC_RX_MIC_KEY_LEN], + tx_mic, WILC_TX_MIC_KEY_LEN); wid_list[1].id = WID_ADD_PTK; wid_list[1].type = WID_STR; @@ -1274,11 +1274,11 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len, if (rx_mic) memcpy(&key_buf->key[ptk_key_len], rx_mic, - RX_MIC_KEY_LEN); + WILC_RX_MIC_KEY_LEN); if (tx_mic) - memcpy(&key_buf->key[ptk_key_len + RX_MIC_KEY_LEN], - tx_mic, TX_MIC_KEY_LEN); + memcpy(&key_buf->key[ptk_key_len + WILC_RX_MIC_KEY_LEN], + tx_mic, WILC_TX_MIC_KEY_LEN); wid.id = WID_ADD_PTK; wid.type = WID_STR; @@ -1299,7 +1299,7 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len, { int result = 0; struct wilc_gtk_key *gtk_key; - int t_key_len = gtk_key_len + RX_MIC_KEY_LEN + TX_MIC_KEY_LEN; + int t_key_len = gtk_key_len + WILC_RX_MIC_KEY_LEN + WILC_TX_MIC_KEY_LEN; gtk_key = kzalloc(sizeof(*gtk_key) + t_key_len, GFP_KERNEL); if (!gtk_key) @@ -1317,11 +1317,11 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len, memcpy(>k_key->key[0], rx_gtk, gtk_key_len); if (rx_mic) - memcpy(>k_key->key[gtk_key_len], rx_mic, RX_MIC_KEY_LEN); + memcpy(>k_key->key[gtk_key_len], rx_mic, WILC_RX_MIC_KEY_LEN); if (tx_mic) - memcpy(>k_key->key[gtk_key_len + RX_MIC_KEY_LEN], - tx_mic, TX_MIC_KEY_LEN); + memcpy(>k_key->key[gtk_key_len + WILC_RX_MIC_KEY_LEN], + tx_mic, WILC_TX_MIC_KEY_LEN); if (mode == WILC_AP_MODE) { struct wid wid_list[2]; @@ -1819,7 +1819,7 @@ int wilc_remain_on_channel(struct wilc_vif *vif, u64 cookie, void (*expired)(void *, u64), void *user_arg) { - struct remain_ch roc; + struct wilc_remain_ch roc; int result; roc.ch = chan; @@ -2017,7 +2017,7 @@ int wilc_del_allstation(struct wilc_vif *vif, u8 mac_addr[][ETH_ALEN]) int result; int i; u8 assoc_sta = 0; - struct del_all_sta del_sta; + struct wilc_del_all_sta del_sta; memset(&del_sta, 0x0, sizeof(del_sta)); for (i = 0; i < WILC_MAX_NUM_STA; i++) { diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 790f83e..a007625 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -21,8 +21,8 @@ enum { #define WILC_MAX_NUM_SCANNED_CH 14 #define WILC_MAX_NUM_PROBED_SSID 10 -#define TX_MIC_KEY_LEN 8 -#define RX_MIC_KEY_LEN 8 +#define WILC_TX_MIC_KEY_LEN 8 +#define WILC_RX_MIC_KEY_LEN 8 #define WILC_MAX_NUM_PMKIDS 16 #define WILC_ADD_STA_LENGTH 40 @@ -115,7 +115,7 @@ struct wilc_probe_ssid { u32 size; }; -struct user_scan_req { +struct wilc_user_scan_req { void (*scan_result)(enum scan_event evt, struct wilc_rcvd_net_info *info, void *priv); void *arg; @@ -137,7 +137,7 @@ struct wilc_conn_info { void *param; }; -struct remain_ch { +struct wilc_remain_ch { u16 ch; u32 duration; void (*expired)(void *priv, u64 cookie); @@ -147,9 +147,9 @@ struct remain_ch { struct wilc; struct host_if_drv { - struct user_scan_req usr_scan_req; + struct wilc_user_scan_req usr_scan_req; struct wilc_conn_info conn_info; - struct remain_ch remain_on_ch; + struct wilc_remain_ch remain_on_ch; u64 p2p_timeout; enum host_if_state hif_state; diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c index 153e120..4a1be9e 100644 --- a/drivers/staging/wilc1000/wilc_spi.c +++ b/drivers/staging/wilc1000/wilc_spi.c @@ -814,7 +814,7 @@ static int wilc_spi_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) * ********************************************/ -static int _wilc_spi_deinit(struct wilc *wilc) +static int wilc_spi_deinit(struct wilc *wilc) { /* * TODO: @@ -1122,7 +1122,7 @@ static int wilc_spi_sync_ext(struct wilc *wilc, int nint) /* Global spi HIF function table */ static const struct wilc_hif_func wilc_hif_spi = { .hif_init = wilc_spi_init, - .hif_deinit = _wilc_spi_deinit, + .hif_deinit = wilc_spi_deinit, .hif_read_reg = wilc_spi_read_reg, .hif_write_reg = wilc_spi_write_reg, .hif_block_rx = wilc_spi_read, diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 8fb4bd4..5e7a467 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -27,7 +27,7 @@ #define GAS_INITIAL_REQ 0x0a #define GAS_INITIAL_RSP 0x0b -#define INVALID_CHANNEL 0 +#define WILC_INVALID_CHANNEL 0 static const struct ieee80211_txrx_stypes wilc_wfi_cfg80211_mgmt_types[NUM_NL80211_IFTYPES] = { @@ -62,7 +62,7 @@ static const struct wiphy_wowlan_support wowlan_support = { .flags = WIPHY_WOWLAN_ANY }; -struct p2p_mgmt_data { +struct wilc_p2p_mgmt_data { int size; u8 *buff; }; @@ -158,7 +158,7 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, u8 mac_status, wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE); if (vif->iftype != WILC_CLIENT_MODE) - wl->sta_ch = INVALID_CHANNEL; + wl->sta_ch = WILC_INVALID_CHANNEL; netdev_err(dev, "Unspecified failure\n"); } @@ -184,7 +184,7 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, u8 mac_status, wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE); if (vif->iftype != WILC_CLIENT_MODE) - wl->sta_ch = INVALID_CHANNEL; + wl->sta_ch = WILC_INVALID_CHANNEL; if (wfi_drv->ifc_up && dev == wl->vif[1]->ndev) reason = 3; @@ -446,7 +446,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, netdev_err(dev, "wilc_set_join_req(): Error\n"); ret = -ENOENT; if (vif->iftype != WILC_CLIENT_MODE) - vif->wilc->sta_ch = INVALID_CHANNEL; + vif->wilc->sta_ch = WILC_INVALID_CHANNEL; wilc_wlan_set_bssid(dev, NULL, WILC_STATION_MODE); wfi_drv->conn_info.conn_result = NULL; kfree(join_params); @@ -484,7 +484,7 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, } if (vif->iftype != WILC_CLIENT_MODE) - wilc->sta_ch = INVALID_CHANNEL; + wilc->sta_ch = WILC_INVALID_CHANNEL; wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE); priv->p2p.local_random = 0x01; @@ -974,7 +974,7 @@ static void wilc_wfi_cfg_parse_rx_action(u8 *buf, u32 len, u8 sta_ch) op_channel_attr_index = index; index += buf[index + 1] + 3; } - if (sta_ch != INVALID_CHANNEL) + if (sta_ch != WILC_INVALID_CHANNEL) wilc_wfi_cfg_parse_ch_attr(buf, channel_list_attr_index, op_channel_attr_index, sta_ch); } @@ -999,7 +999,7 @@ static void wilc_wfi_cfg_parse_tx_action(u8 *buf, u32 len, bool oper_ch, op_channel_attr_index = index; index += buf[index + 1] + 3; } - if (sta_ch != INVALID_CHANNEL && oper_ch) + if (sta_ch != WILC_INVALID_CHANNEL && oper_ch) wilc_wfi_cfg_parse_ch_attr(buf, channel_list_attr_index, op_channel_attr_index, sta_ch); } @@ -1115,7 +1115,7 @@ void wilc_wfi_p2p_rx(struct net_device *dev, u8 *buff, u32 size) static void wilc_wfi_mgmt_tx_complete(void *priv, int status) { - struct p2p_mgmt_data *pv_data = priv; + struct wilc_p2p_mgmt_data *pv_data = priv; kfree(pv_data->buff); kfree(pv_data); @@ -1189,7 +1189,7 @@ static int cancel_remain_on_channel(struct wiphy *wiphy, } static void wilc_wfi_cfg_tx_vendor_spec(struct wilc_priv *priv, - struct p2p_mgmt_data *mgmt_tx, + struct wilc_p2p_mgmt_data *mgmt_tx, struct cfg80211_mgmt_tx_params *params, u8 iftype, u32 buf_len) { @@ -1249,7 +1249,7 @@ static int mgmt_tx(struct wiphy *wiphy, const u8 *buf = params->buf; size_t len = params->len; const struct ieee80211_mgmt *mgmt; - struct p2p_mgmt_data *mgmt_tx; + struct wilc_p2p_mgmt_data *mgmt_tx; struct wilc_priv *priv = wiphy_priv(wiphy); struct host_if_drv *wfi_drv = priv->hif_drv; struct wilc_vif *vif = netdev_priv(wdev->netdev); diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 7a757c9..af1c4d8 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -523,7 +523,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) if (vmm_sz & 0x3) vmm_sz = (vmm_sz + 4) & ~0x3; - if ((sum + vmm_sz) > LINUX_TX_SIZE) + if ((sum + vmm_sz) > WILC_TX_BUFF_SIZE) break; vmm_table[i] = vmm_sz / 4; @@ -811,7 +811,7 @@ static void wilc_wlan_handle_isr_ext(struct wilc *wilc, u32 int_status) if (size <= 0) return; - if (LINUX_RX_SIZE - offset < size) + if (WILC_RX_BUFF_SIZE - offset < size) offset = 0; buffer = &wilc->rx_buffer[offset]; @@ -1314,7 +1314,7 @@ int wilc_wlan_init(struct net_device *dev) } if (!wilc->tx_buffer) - wilc->tx_buffer = kmalloc(LINUX_TX_SIZE, GFP_KERNEL); + wilc->tx_buffer = kmalloc(WILC_TX_BUFF_SIZE, GFP_KERNEL); if (!wilc->tx_buffer) { ret = -ENOBUFS; @@ -1322,7 +1322,7 @@ int wilc_wlan_init(struct net_device *dev) } if (!wilc->rx_buffer) - wilc->rx_buffer = kmalloc(LINUX_RX_SIZE, GFP_KERNEL); + wilc->rx_buffer = kmalloc(WILC_RX_BUFF_SIZE, GFP_KERNEL); if (!wilc->rx_buffer) { ret = -ENOBUFS; diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h index 1d61e20..d8fabe8 100644 --- a/drivers/staging/wilc1000/wilc_wlan.h +++ b/drivers/staging/wilc1000/wilc_wlan.h @@ -131,8 +131,8 @@ #define WILC_PLL_TO_SPI 2 #define ABORT_INT BIT(31) -#define LINUX_RX_SIZE (96 * 1024) -#define LINUX_TX_SIZE (64 * 1024) +#define WILC_RX_BUFF_SIZE (96 * 1024) +#define WILC_TX_BUFF_SIZE (64 * 1024) #define MODALIAS "WILC_SPI" #define GPIO_NUM 0x44 @@ -248,7 +248,7 @@ struct wilc_hif_func { void (*disable_interrupt)(struct wilc *nic); }; -#define MAX_CFG_FRAME_SIZE 1468 +#define WILC_MAX_CFG_FRAME_SIZE 1468 struct wilc_cfg_cmd_hdr { u8 cmd_type; @@ -259,7 +259,7 @@ struct wilc_cfg_cmd_hdr { struct wilc_cfg_frame { struct wilc_cfg_cmd_hdr hdr; - u8 frame[MAX_CFG_FRAME_SIZE]; + u8 frame[WILC_MAX_CFG_FRAME_SIZE]; }; struct wilc_cfg_rsp { diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c index 67e9f93..9dc5de4 100644 --- a/drivers/staging/wilc1000/wilc_wlan_cfg.c +++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c @@ -54,7 +54,7 @@ static int wilc_wlan_cfg_set_byte(u8 *frame, u32 offset, u16 id, u8 val8) { u8 *buf; - if ((offset + 4) >= MAX_CFG_FRAME_SIZE) + if ((offset + 4) >= WILC_MAX_CFG_FRAME_SIZE) return 0; buf = &frame[offset]; @@ -71,7 +71,7 @@ static int wilc_wlan_cfg_set_hword(u8 *frame, u32 offset, u16 id, u16 val16) { u8 *buf; - if ((offset + 5) >= MAX_CFG_FRAME_SIZE) + if ((offset + 5) >= WILC_MAX_CFG_FRAME_SIZE) return 0; buf = &frame[offset]; @@ -90,7 +90,7 @@ static int wilc_wlan_cfg_set_word(u8 *frame, u32 offset, u16 id, u32 val32) { u8 *buf; - if ((offset + 7) >= MAX_CFG_FRAME_SIZE) + if ((offset + 7) >= WILC_MAX_CFG_FRAME_SIZE) return 0; buf = &frame[offset]; @@ -112,7 +112,7 @@ static int wilc_wlan_cfg_set_str(u8 *frame, u32 offset, u16 id, u8 *str, { u8 *buf; - if ((offset + size + 4) >= MAX_CFG_FRAME_SIZE) + if ((offset + size + 4) >= WILC_MAX_CFG_FRAME_SIZE) return 0; buf = &frame[offset]; @@ -134,7 +134,7 @@ static int wilc_wlan_cfg_set_bin(u8 *frame, u32 offset, u16 id, u8 *b, u32 size) u32 i; u8 checksum = 0; - if ((offset + size + 5) >= MAX_CFG_FRAME_SIZE) + if ((offset + size + 5) >= WILC_MAX_CFG_FRAME_SIZE) return 0; buf = &frame[offset]; @@ -309,7 +309,7 @@ int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id) { u8 *buf; - if ((offset + 2) >= MAX_CFG_FRAME_SIZE) + if ((offset + 2) >= WILC_MAX_CFG_FRAME_SIZE) return 0; buf = &frame[offset]; diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h index 26aad49..9b8cce8 100644 --- a/drivers/staging/wilc1000/wilc_wlan_if.h +++ b/drivers/staging/wilc1000/wilc_wlan_if.h @@ -45,7 +45,7 @@ struct tx_complete_data { * ********************************************/ #define WILC_MULTICAST_TABLE_SIZE 8 -#define MAX_RATES_SUPPORTED 12 +#define WILC_MAX_RATES_SUPPORTED 12 enum bss_types { WILC_FW_BSS_TYPE_INFRA = 0, From patchwork Thu Feb 7 07:22:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800499 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C1A5313A4 for ; Thu, 7 Feb 2019 07:22:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A87622C800 for ; Thu, 7 Feb 2019 07:22:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C8342C95B; Thu, 7 Feb 2019 07:22:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F1902C800 for ; Thu, 7 Feb 2019 07:22:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726716AbfBGHWg (ORCPT ); Thu, 7 Feb 2019 02:22:36 -0500 Received: from esa6.microchip.iphmx.com ([216.71.154.253]:10628 "EHLO esa6.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726186AbfBGHWg (ORCPT ); Thu, 7 Feb 2019 02:22:36 -0500 X-IronPort-AV: E=Sophos;i="5.58,342,1544511600"; d="scan'208";a="23532150" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 00:22:34 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.108) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 00:22:34 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NaT5pk9V42i3kf33kIzO81mo3ZxEJPgAHQ7ak10Tas4=; b=aotHl3tLq0C6AWcjBM8V95Id24ecKIUW5/vG+hoKkVhbFCxp0gGR8dVq/mHMziq0bKqb1GKj24wN/kPpGYc84OJSV+Clnfi/Gr/K3BVRwjw+PguncCanG7qnQhLvOs4XtMw+VlnsY4EVN6GSee8Hq4PPp/Lxn3r8Q1k0Oloabgg= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB3415.namprd11.prod.outlook.com (20.177.224.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Thu, 7 Feb 2019 07:22:32 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 07:22:32 +0000 From: To: CC: , , , , Subject: [PATCH 4/9] staging: wilc1000: move macro and function prototype from wilc_wlan_if.h file Thread-Topic: [PATCH 4/9] staging: wilc1000: move macro and function prototype from wilc_wlan_if.h file Thread-Index: AQHUvrXkIzHyd3+Ws02t0nuvEjSpRg== Date: Thu, 7 Feb 2019 07:22:32 +0000 Message-ID: <1549519927-2651-5-git-send-email-ajay.kathat@microchip.com> References: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MAXPR0101CA0020.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::30) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [223.237.230.157] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB3415;6:CH+uyKS35uZJfybc7sG+cxbs8wwTguNpTbGfnfGpGdKvFOMiYESdhxZM3P2aaqO+d816wCRP6WWHX6oUQS7ojiIaXzrIaJ7P3Lik7TaaWrbhh4lYnsNMMNpbzAZ7SsPCPhTA4Lvv5sGA2tFsCZJRCoNBbm49poNiDLG/Js7Ud5GCI1Cez3zRgMsrTM+9NMcHUjJqGtp1y+o+2jS8hGnLdPNrVBsKDy6axi5WfT8bGvZbI5LQS80VrKYJb3E6XDcmNA55aTcaxJ4bF/M55kEjsozjreK6OjNNvib2bNQBMrKWWI5A7E34cyZKIA3Ag/3dTdQEV/aeAwGUS1Q8owL98nbqZ13Df6uKWViIwHZRUHupmklfMDzz9nhENIzBD5Uz7uDGotXFQMKLEL7kjcL5BhKE1yLrkqNujNfPSk+7fF5VXntS1ZUsJBDrnzuL01rVIhg3ulDFVYsffDzGz8/qKQ==;5:kLzTZ0zdG6YBFBwTBQhLaJcsoUu3IVu5MNKEoPkUm2nLr2lJSUhC4VrodxdhmzT2yIHdL8U0o3XP41chUgCNmam5d13+4SMvVvQ4nKydeEod0lPB5V5vkcnXpoE32LOJctXSLusAndq8MmOZjZF3WvyoVu8E+ZrrySl5bQEqR2ectguSKEI622I3x3QnrOqeLssd/1ssvT5dT8zjXF1dZA==;7:EXXViijMIuaaI42aZ8y6GcjjvGbmcBwPzegTvbReYgeeq+LpwEvUsP6JVVRkACAdBfXElV61LbMCjiUDbTqzn0EmLcmUsQtxeTGCNoR2PfQQs2jXJM33frJWTykY7PuYZ6baO6g188AURNRLlmouHQ== x-ms-office365-filtering-correlation-id: fcc29b09-a994-4fac-544e-08d68ccd0647 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB3415; x-ms-traffictypediagnostic: BYAPR11MB3415: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(136003)(366004)(396003)(376002)(189003)(199004)(86362001)(5640700003)(478600001)(6116002)(446003)(3846002)(72206003)(6486002)(11346002)(6436002)(25786009)(2351001)(2616005)(476003)(6512007)(105586002)(106356001)(486006)(26005)(6506007)(102836004)(386003)(36756003)(71190400001)(2501003)(97736004)(71200400001)(81156014)(305945005)(66066001)(54906003)(4326008)(186003)(68736007)(8936002)(81166006)(107886003)(52116002)(50226002)(53936002)(256004)(6916009)(14444005)(316002)(99286004)(14454004)(2906002)(76176011)(7736002)(8676002);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB3415;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 2cnhpM7v9IYqgWzswCllX1UmE7Y5cB39wdq/RuNSgOE8V28V9rHnhY8SucphtYw6hn9BHNuMx+ubieMI0SstPMvtbQOxrSMlg8HeGsKva9Wih4QLR4eL3ZQ63CjyT12Fr+omAFEfIHCQdabCkD1PEC7rcgSLuHB/jUfyowaBO4NKUToLii5OqpROADcx70eOBZSXnZ/NR7NLBpMNBsNYBofgMzvVBKVjs+g/PD7CxsaMAwxkpVoMRnxt5Gh06jb5XeS2YDiX+hL4LgTccUjpxyTchaWBjcQKH0lv0HFiFAlNzD1i1l87rlfZF+hG4IP40TzcNck2er4kIYY74x2tDnI0AOreSCTfBbLZ5tnNHMMMcen7wvpcNqXOpxIZrZEUDxmHbjDiBuBppktkkfYQGwOvgd3bqLjqSqlf0GW4MPo= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: fcc29b09-a994-4fac-544e-08d68ccd0647 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 07:22:29.7359 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3415 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Move data structure and function prototype from 'wilc_wlan_if.h file. Now, this file contains constant specific to the firmware. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/host_interface.c | 1 + drivers/staging/wilc1000/host_interface.h | 11 ++++++++++ drivers/staging/wilc1000/linux_wlan.c | 2 ++ drivers/staging/wilc1000/wilc_wlan.h | 9 ++++++++ drivers/staging/wilc1000/wilc_wlan_if.h | 36 ------------------------------- 5 files changed, 23 insertions(+), 36 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 9abe341..50dc2dd 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -10,6 +10,7 @@ #define WILC_HIF_CONNECT_TIMEOUT_MS 9500 #define WILC_FALSE_FRMWR_CHANNEL 100 +#define WILC_MAX_RATES_SUPPORTED 12 struct wilc_rcvd_mac_info { u8 status; diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index a007625..678e623 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -97,6 +97,17 @@ enum conn_event { CONN_DISCONN_EVENT_FORCE_32BIT = 0xFFFFFFFF }; +enum { + WILC_HIF_SDIO = 0, + WILC_HIF_SPI = BIT(0) +}; + +enum { + WILC_MAC_STATUS_INIT = -1, + WILC_MAC_STATUS_DISCONNECTED = 0, + WILC_MAC_STATUS_CONNECTED = 1 +}; + struct wilc_rcvd_net_info { s8 rssi; u8 ch; diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 8fa5f90..b279811 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -12,6 +12,8 @@ #include "wilc_wfi_cfgoperations.h" +#define WILC_MULTICAST_TABLE_SIZE 8 + static irqreturn_t isr_uh_routine(int irq, void *user_data) { struct net_device *dev = user_data; diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h index d8fabe8..1a27f62 100644 --- a/drivers/staging/wilc1000/wilc_wlan.h +++ b/drivers/staging/wilc1000/wilc_wlan.h @@ -250,6 +250,13 @@ struct wilc_hif_func { #define WILC_MAX_CFG_FRAME_SIZE 1468 +struct tx_complete_data { + int size; + void *buff; + u8 *bssid; + struct sk_buff *skb; +}; + struct wilc_cfg_cmd_hdr { u8 cmd_type; u8 seq_no; @@ -301,4 +308,6 @@ void chip_allow_sleep(struct wilc *wilc); void chip_wakeup(struct wilc *wilc); int wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids, u32 count, u32 drv); +int wilc_wlan_init(struct net_device *dev); +u32 wilc_get_chipid(struct wilc *wilc, bool update); #endif diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h index 9b8cce8..b15de36 100644 --- a/drivers/staging/wilc1000/wilc_wlan_if.h +++ b/drivers/staging/wilc1000/wilc_wlan_if.h @@ -11,41 +11,9 @@ /******************************************** * - * Host Interface Defines - * - ********************************************/ - -enum { - WILC_HIF_SDIO = 0, - WILC_HIF_SPI = BIT(0) -}; - -/******************************************** - * - * Wlan Interface Defines - * - ********************************************/ - -enum { - WILC_MAC_STATUS_INIT = -1, - WILC_MAC_STATUS_DISCONNECTED = 0, - WILC_MAC_STATUS_CONNECTED = 1 -}; - -struct tx_complete_data { - int size; - void *buff; - u8 *bssid; - struct sk_buff *skb; -}; - -/******************************************** - * * Wlan Configuration ID * ********************************************/ -#define WILC_MULTICAST_TABLE_SIZE 8 -#define WILC_MAX_RATES_SUPPORTED 12 enum bss_types { WILC_FW_BSS_TYPE_INFRA = 0, @@ -832,8 +800,4 @@ enum { WID_MAX = 0xFFFF }; -struct wilc; -int wilc_wlan_init(struct net_device *dev); -u32 wilc_get_chipid(struct wilc *wilc, bool update); - #endif From patchwork Thu Feb 7 07:22:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800501 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CAC7E13A4 for ; Thu, 7 Feb 2019 07:22:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B089A2C800 for ; Thu, 7 Feb 2019 07:22:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A49BF2C95B; Thu, 7 Feb 2019 07:22:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32E302C800 for ; Thu, 7 Feb 2019 07:22:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726728AbfBGHWi (ORCPT ); Thu, 7 Feb 2019 02:22:38 -0500 Received: from esa6.microchip.iphmx.com ([216.71.154.253]:10628 "EHLO esa6.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726186AbfBGHWi (ORCPT ); Thu, 7 Feb 2019 02:22:38 -0500 X-IronPort-AV: E=Sophos;i="5.58,342,1544511600"; d="scan'208";a="23532154" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 00:22:37 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.108) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 00:22:37 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z+vHQ1mj2EjPsMFWZFfPFFsz1Y8ZB6ftnSsUBCBYybo=; b=yrHWFWYz+tpNQUmY0j9nE02/YwA1nxVvFDm6qljDpdhIF+bH0QVTyE1wECSMFGKzQBBjNQjCwpBXosTclF32z+fASCycdcK/P5jgR0bWYTb5aEhpi58kXcqB9gfEPn3DQBw9fSAE6hIchjFdsRvwh2qtnDK29mTTqLKHhmzXF/8= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB3415.namprd11.prod.outlook.com (20.177.224.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Thu, 7 Feb 2019 07:22:36 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 07:22:36 +0000 From: To: CC: , , , , Subject: [PATCH 5/9] staging: wilc1000: avoid function forward declaration in wilc_sdio.c file Thread-Topic: [PATCH 5/9] staging: wilc1000: avoid function forward declaration in wilc_sdio.c file Thread-Index: AQHUvrXm9D8ud1/Hi0y6Oh4SPfjteg== Date: Thu, 7 Feb 2019 07:22:36 +0000 Message-ID: <1549519927-2651-6-git-send-email-ajay.kathat@microchip.com> References: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MAXPR0101CA0020.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::30) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [223.237.230.157] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB3415;6:UiA2Qj8+w6NL9ci2klR4TbUSeUsYJ4TiHNvAbrmH41QuHKjSoEPbcuR8nMSpDfQm/+86IMeDuq088kmoui2hH9sM/ZxJi7yfjGCo1bEmYaYXkouyciKg8Skxz8oESA8BFoV7VLt93fo6LziDLpqJodZlxbLshB7tZFbn3Af/N7RO28yCEqCa6u+MFfkIpqsa4GUwAP8tTOqUWNUSdp/7wMWy1jWPaiC482ZPJjYjEh8klsj6ZM+K3vDMDfzDLFfnqZMeRdNE3W3/Tf6xiKVaz8jzzrSrSakR0ctLfzlyy5YDNLjlnhcincOLgNEAK52xl/N7zcQqdXUWAziZmwdkzGbJCDBob7pAvyRXn1/Pj2xGHp70RLkF+p/evGzoJtytxH5vsiEQa0pUQLeQ3hsXM7mN5SwERveSY5r6L39MM+GR+/5ChjaFCAlbGqyxUK9vS+wC+KjJAUKQITvBcp40pg==;5:w2R0Os+TgdTusToAC7VVnffqNnmE3ygLcACEXMyB9ub8hsMj+rNxQNQlLHgi5ivKmPO+xTfGub4X4lpEX25YbgKjHVrl7E2mrREOYT6fGn5zym9GWrprnPdYTW33ANjTMXifdzrHAlakGYYl5a/ghgdshPPgM3P4BG6y/PtAPbo8qczRNUv1eiYzuCVAsV0zLUu7yd/72HwG76ZPRt9EMA==;7:KaULiWkacVlPnXp4xbogw/cZ2q9ADiYqhm5D3DYiYRyD6rAVnEeD+bbInF8KmnuixqyvI6v3Tz9GR2NggcpZkbLvzOm0q1EMgk+VY5Wu3OzCxf2xAi/mUblb6yCFrL+is9ms0Pm/SQaKRhBl431lrQ== x-ms-office365-filtering-correlation-id: 3ef257f4-0884-41d5-11bc-08d68ccd085e x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB3415; x-ms-traffictypediagnostic: BYAPR11MB3415: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(136003)(366004)(396003)(376002)(189003)(199004)(86362001)(5640700003)(478600001)(6116002)(446003)(3846002)(72206003)(6486002)(11346002)(6436002)(25786009)(2351001)(2616005)(476003)(6512007)(105586002)(106356001)(486006)(26005)(6506007)(102836004)(386003)(36756003)(71190400001)(2501003)(97736004)(71200400001)(81156014)(305945005)(66066001)(54906003)(4326008)(186003)(68736007)(8936002)(81166006)(107886003)(52116002)(50226002)(53936002)(256004)(6916009)(14444005)(316002)(99286004)(14454004)(2906002)(76176011)(7736002)(8676002);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB3415;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: b1S8U5HdCdxppjnxk/we3VQaf9FOdfGvpSB/YSWSOF6jhUzWARgY7l3fDKfrPLuTOrPahWqjzNmUGYF0IdjraxnOrEx98dF0ks2HnzoZOpG1JssbQ0pz21tfXQXbvcN4f8PQHD/eBGKsgl21oM7RfB5coJOceO/TSFQBM+sDmGepXYtLiLiuAUhReKleJfmdNo/YNUkn/H2INn7vwbU1x9PQT7drwR14DSuCkLAfjYX5SAQyzw3kx4m9J+6l/auDepB+w5AIYcELT+ntgTD5WZLklaj4K9xYrlKjeH2S5Wf5ACNu1W/hauC9baC/OmNSylobBc9T8M6sejFdkANTCTrYcUY7zNiOeo/iRQD26tWmoFeOCRvqYr9DrLsVaJV+gaavYATjA7YX3i0hNbhL2mlV4kgmyQa2Tg/BB1N6ITA= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 3ef257f4-0884-41d5-11bc-08d68ccd085e X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 07:22:33.1703 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3415 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Cleanup patch to avoid function forward declaration by reordering the function. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/wilc_sdio.c | 91 +++++++++++++++++------------------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c index e2f739f..a62eabe 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/wilc_sdio.c @@ -51,10 +51,6 @@ struct sdio_cmd53 { static const struct wilc_hif_func wilc_hif_sdio; -static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data); -static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data); -static int sdio_init(struct wilc *wilc, bool resume); - static void wilc_sdio_interrupt(struct sdio_func *func) { sdio_release_host(func); @@ -215,50 +211,6 @@ static int wilc_sdio_suspend(struct device *dev) return 0; } -static int wilc_sdio_resume(struct device *dev) -{ - struct sdio_func *func = dev_to_sdio_func(dev); - struct wilc *wilc = sdio_get_drvdata(func); - - dev_info(dev, "sdio resume\n"); - sdio_release_host(func); - chip_wakeup(wilc); - sdio_init(wilc, true); - - if (wilc->suspend_event) - host_wakeup_notify(wilc); - - chip_allow_sleep(wilc); - - return 0; -} - -static const struct of_device_id wilc_of_match[] = { - { .compatible = "microchip,wilc1000-sdio", }, - { /* sentinel */ } -}; -MODULE_DEVICE_TABLE(of, wilc_of_match); - -static const struct dev_pm_ops wilc_sdio_pm_ops = { - .suspend = wilc_sdio_suspend, - .resume = wilc_sdio_resume, -}; - -static struct sdio_driver wilc_sdio_driver = { - .name = SDIO_MODALIAS, - .id_table = wilc_sdio_ids, - .probe = linux_sdio_probe, - .remove = linux_sdio_remove, - .drv = { - .pm = &wilc_sdio_pm_ops, - .of_match_table = wilc_of_match, - } -}; -module_driver(wilc_sdio_driver, - sdio_register_driver, - sdio_unregister_driver); -MODULE_LICENSE("GPL"); - static int wilc_sdio_enable_interrupt(struct wilc *dev) { struct sdio_func *func = container_of(dev->dev, struct sdio_func, dev); @@ -1143,3 +1095,46 @@ static const struct wilc_hif_func wilc_hif_sdio = { .disable_interrupt = wilc_sdio_disable_interrupt, }; +static int wilc_sdio_resume(struct device *dev) +{ + struct sdio_func *func = dev_to_sdio_func(dev); + struct wilc *wilc = sdio_get_drvdata(func); + + dev_info(dev, "sdio resume\n"); + sdio_release_host(func); + chip_wakeup(wilc); + sdio_init(wilc, true); + + if (wilc->suspend_event) + host_wakeup_notify(wilc); + + chip_allow_sleep(wilc); + + return 0; +} + +static const struct of_device_id wilc_of_match[] = { + { .compatible = "microchip,wilc1000-sdio", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, wilc_of_match); + +static const struct dev_pm_ops wilc_sdio_pm_ops = { + .suspend = wilc_sdio_suspend, + .resume = wilc_sdio_resume, +}; + +static struct sdio_driver wilc_sdio_driver = { + .name = SDIO_MODALIAS, + .id_table = wilc_sdio_ids, + .probe = linux_sdio_probe, + .remove = linux_sdio_remove, + .drv = { + .pm = &wilc_sdio_pm_ops, + .of_match_table = wilc_of_match, + } +}; +module_driver(wilc_sdio_driver, + sdio_register_driver, + sdio_unregister_driver); +MODULE_LICENSE("GPL"); From patchwork Thu Feb 7 07:22:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800503 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C1D1B13A4 for ; Thu, 7 Feb 2019 07:22:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A60522C800 for ; Thu, 7 Feb 2019 07:22:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A2252C95B; Thu, 7 Feb 2019 07:22:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B43D22C800 for ; Thu, 7 Feb 2019 07:22:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726733AbfBGHWn (ORCPT ); Thu, 7 Feb 2019 02:22:43 -0500 Received: from esa4.microchip.iphmx.com ([68.232.154.123]:48985 "EHLO esa4.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726186AbfBGHWm (ORCPT ); Thu, 7 Feb 2019 02:22:42 -0500 X-IronPort-AV: E=Sophos;i="5.58,342,1544511600"; d="scan'208";a="25947747" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES128-SHA; 07 Feb 2019 00:22:41 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.37) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 00:22:41 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+rfhB4kj57y6C8d1chqVEqkYHtwJIk8ZLET+5Gscvm8=; b=FQuz4krBl42XZ2PWj9QFBjRqB4Jm4/2dWMsjCPc2/ooccMeJ3ZIGRRwiT0okatPmAYDKGuUD3q4BmpI2G/IljGzC6wbpOdus6flTmY+ljNEF67x/WTPi7MnbkxrDWFxhhI9s9G3Gp+qG+4QoxZLeWLVh2LW/jNXicOfbB0jrBRU= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB3415.namprd11.prod.outlook.com (20.177.224.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Thu, 7 Feb 2019 07:22:40 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 07:22:40 +0000 From: To: CC: , , , , Subject: [PATCH 6/9] staging: wilc1000: added 'wilc_' prefix for function in wilc_sdio.c file Thread-Topic: [PATCH 6/9] staging: wilc1000: added 'wilc_' prefix for function in wilc_sdio.c file Thread-Index: AQHUvrXoNvKNqj4xJkm1rv3RQIj0YA== Date: Thu, 7 Feb 2019 07:22:39 +0000 Message-ID: <1549519927-2651-7-git-send-email-ajay.kathat@microchip.com> References: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MAXPR0101CA0020.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::30) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [223.237.230.157] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB3415;6:rZQCibzvXcMVqt3uePG0ju0Erq04h9EvQJsajPssFRKa3amhHZ/BY1Kdh/K+Dz5AtW2gqDL8fQS8eqS6t9K2XFcke3yCzR2mEUnZSNr1N4cTH4OU+dqsODQczj3fuTUSOdd6hWQZNQrg6FXmYCkOVeVBIskmFZVNC9JUnGLxufsK+XjM0CRWYHUgPCCzWStXFPCkocXonpk/WN39q8zP1yRA2xsGOIP0hUsAndWeFWyAIGzpRBxepg1A0X//3H+pBN1Y4Cet9uNekOEmseBbmbVOj6Ia10ngCimv2INp9ohzVr2fOlcb2k7gkFCFQ0VufQLGPDP56Kj34fFtCWNrG3kwIuwOugHI4BK428mij9NahOWmrUXQWa6qo3rbS+hNxrZSJbibuZC/wfwfZfh9Ou7hP99MST8LCdklkdyWI6asadySk8JInNJ8f5l3GCUDchs1gTM/Ikok+PgfCBDF5A==;5:gqU2U14kMaHBv0uSOfGugCUEv7sgBpjhq/B0k3dPiuIKPEIrXtV5D8bgfQOomblFVS1mI6Ck1YGWEmDNUu4By8F3Qhgi0BS0ZHo1eSUm3X3zvhLuAj3rZrb6p8aU739PSKbITN+w2huiSd4SE5c0G4jTSBcEP0S1cfWfsFz7MzcJpcfrXg8oRiz50qX92lmfq4uwmYUAXRzXXoYeanuR5w==;7:pjpRPQIIcsb6Khkuanw91ORTpY4p/g5yCl108LvuXiSH/6mImEiBHymrJ295hLQEfOe70ixQAwoiJJWqCrSzhQRBb3ecr3flYjM93gI1fBY+WJZnBEcgOxAOTgq6dSuaxur5bIQ0Wi4+moUn822QNA== x-ms-office365-filtering-correlation-id: fe1aee5d-7d1d-4c33-8ae6-08d68ccd0a46 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB3415; x-ms-traffictypediagnostic: BYAPR11MB3415: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(136003)(366004)(396003)(376002)(189003)(199004)(86362001)(5640700003)(478600001)(6116002)(446003)(3846002)(72206003)(6486002)(11346002)(6436002)(25786009)(2351001)(2616005)(476003)(6512007)(105586002)(106356001)(486006)(26005)(6506007)(102836004)(386003)(36756003)(71190400001)(30864003)(2501003)(97736004)(71200400001)(81156014)(305945005)(66066001)(54906003)(4326008)(186003)(68736007)(8936002)(81166006)(107886003)(52116002)(50226002)(53936002)(256004)(6916009)(14444005)(316002)(99286004)(14454004)(2906002)(76176011)(7736002)(8676002);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB3415;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: K0etkpnw+pUQpHXmJAEhTvJgek/oZtZiXBMAfEEVm4aCKgxUz2qojMpD7yaBBt9oeH36qdjiFdGmeUerS9XcOElSHxg8ToytfAQER5D48B59FUas8666tkq6H3rj6thufpjuLWzgmXnma0QGgeyM9p1xrobbsSxxv0KD8EyYik6yhhzBy4flYFJw/UlDvuuUmNAz6Qk4Wqra0uKfTra1jqcSSghSWlRMvMEt+pGpDUVORj+q1kvV8z0NJO6AnbbCCgL+uQz4ZpAmCQGrsDu5ax5kG5VNeJ0lFqf8rZChRzvCRNaLSpUcgL75QFypY7Gl8Dvbjl3I++uy+vn7rjsff1/ycK1nWGSbvYPu3Sb14QZFwCRWaWhJbm1rWdMO2c4s+gqhmnF13qCUbmZy2RK0GrweJzBHMUAbcprgNs5Pxc4= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: fe1aee5d-7d1d-4c33-8ae6-08d68ccd0a46 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 07:22:36.4656 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3415 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Cleanup patch to have proper follow clear namespace in wilc_sdio.c file. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/wilc_sdio.c | 92 ++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c index a62eabe..2ca6757 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/wilc_sdio.c @@ -166,7 +166,7 @@ static void linux_sdio_remove(struct sdio_func *func) wilc_netdev_cleanup(wilc); } -static int sdio_reset(struct wilc *wilc) +static int wilc_sdio_reset(struct wilc *wilc) { struct sdio_cmd52 cmd; int ret; @@ -201,7 +201,7 @@ static int wilc_sdio_suspend(struct device *dev) chip_allow_sleep(wilc); } - ret = sdio_reset(wilc); + ret = wilc_sdio_reset(wilc); if (ret) { dev_err(&func->dev, "Fail reset sdio\n"); return ret; @@ -245,7 +245,7 @@ static void wilc_sdio_disable_interrupt(struct wilc *dev) * ********************************************/ -static int sdio_set_func0_csa_address(struct wilc *wilc, u32 adr) +static int wilc_sdio_set_func0_csa_address(struct wilc *wilc, u32 adr) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_cmd52 cmd; @@ -286,7 +286,7 @@ static int sdio_set_func0_csa_address(struct wilc *wilc, u32 adr) return 0; } -static int sdio_set_func0_block_size(struct wilc *wilc, u32 block_size) +static int wilc_sdio_set_func0_block_size(struct wilc *wilc, u32 block_size) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_cmd52 cmd; @@ -322,7 +322,7 @@ static int sdio_set_func0_block_size(struct wilc *wilc, u32 block_size) * ********************************************/ -static int sdio_set_func1_block_size(struct wilc *wilc, u32 block_size) +static int wilc_sdio_set_func1_block_size(struct wilc *wilc, u32 block_size) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_cmd52 cmd; @@ -356,7 +356,7 @@ static int sdio_set_func1_block_size(struct wilc *wilc, u32 block_size) * Sdio interfaces * ********************************************/ -static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) +static int wilc_sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -384,7 +384,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) /** * set the AHB address **/ - if (!sdio_set_func0_csa_address(wilc, addr)) + if (!wilc_sdio_set_func0_csa_address(wilc, addr)) goto fail; cmd.read_write = 1; @@ -410,7 +410,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) return 0; } -static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) +static int wilc_sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -459,7 +459,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) cmd.buffer = buf; cmd.block_size = block_size; if (addr > 0) { - if (!sdio_set_func0_csa_address(wilc, addr)) + if (!wilc_sdio_set_func0_csa_address(wilc, addr)) goto fail; } ret = wilc_sdio_cmd53(wilc, &cmd); @@ -482,7 +482,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) cmd.block_size = block_size; if (addr > 0) { - if (!sdio_set_func0_csa_address(wilc, addr)) + if (!wilc_sdio_set_func0_csa_address(wilc, addr)) goto fail; } ret = wilc_sdio_cmd53(wilc, &cmd); @@ -500,7 +500,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) return 0; } -static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) +static int wilc_sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -523,7 +523,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) } else { struct sdio_cmd53 cmd; - if (!sdio_set_func0_csa_address(wilc, addr)) + if (!wilc_sdio_set_func0_csa_address(wilc, addr)) goto fail; cmd.read_write = 0; @@ -552,7 +552,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) return 0; } -static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) +static int wilc_sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -601,7 +601,7 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) cmd.buffer = buf; cmd.block_size = block_size; if (addr > 0) { - if (!sdio_set_func0_csa_address(wilc, addr)) + if (!wilc_sdio_set_func0_csa_address(wilc, addr)) goto fail; } ret = wilc_sdio_cmd53(wilc, &cmd); @@ -624,7 +624,7 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) cmd.block_size = block_size; if (addr > 0) { - if (!sdio_set_func0_csa_address(wilc, addr)) + if (!wilc_sdio_set_func0_csa_address(wilc, addr)) goto fail; } ret = wilc_sdio_cmd53(wilc, &cmd); @@ -648,12 +648,12 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) * ********************************************/ -static int sdio_deinit(struct wilc *wilc) +static int wilc_sdio_deinit(struct wilc *wilc) { return 1; } -static int sdio_init(struct wilc *wilc, bool resume) +static int wilc_sdio_init(struct wilc *wilc, bool resume) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -681,7 +681,7 @@ static int sdio_init(struct wilc *wilc, bool resume) /** * function 0 block size **/ - if (!sdio_set_func0_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) { + if (!wilc_sdio_set_func0_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) { dev_err(&func->dev, "Fail cmd 52, set func 0 block size...\n"); goto fail; } @@ -730,7 +730,7 @@ static int sdio_init(struct wilc *wilc, bool resume) /** * func 1 is ready, set func 1 block size **/ - if (!sdio_set_func1_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) { + if (!wilc_sdio_set_func1_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) { dev_err(&func->dev, "Fail set func 1 block size...\n"); goto fail; } @@ -753,7 +753,7 @@ static int sdio_init(struct wilc *wilc, bool resume) * make sure can read back chip id correctly **/ if (!resume) { - if (!sdio_read_reg(wilc, 0x1000, &chipid)) { + if (!wilc_sdio_read_reg(wilc, 0x1000, &chipid)) { dev_err(&func->dev, "Fail cmd read chip id...\n"); goto fail; } @@ -773,7 +773,7 @@ static int sdio_init(struct wilc *wilc, bool resume) return 0; } -static int sdio_read_size(struct wilc *wilc, u32 *size) +static int wilc_sdio_read_size(struct wilc *wilc, u32 *size) { u32 tmp; struct sdio_cmd52 cmd; @@ -798,14 +798,14 @@ static int sdio_read_size(struct wilc *wilc, u32 *size) return 1; } -static int sdio_read_int(struct wilc *wilc, u32 *int_status) +static int wilc_sdio_read_int(struct wilc *wilc, u32 *int_status) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; u32 tmp; struct sdio_cmd52 cmd; - sdio_read_size(wilc, &tmp); + wilc_sdio_read_size(wilc, &tmp); /** * Read IRQ flags @@ -857,7 +857,7 @@ static int sdio_read_int(struct wilc *wilc, u32 *int_status) return 1; } -static int sdio_clear_int_ext(struct wilc *wilc, u32 val) +static int wilc_sdio_clear_int_ext(struct wilc *wilc, u32 val) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -982,7 +982,7 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val) return 0; } -static int sdio_sync_ext(struct wilc *wilc, int nint) +static int wilc_sdio_sync_ext(struct wilc *wilc, int nint) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -1003,13 +1003,13 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) /** * Disable power sequencer **/ - if (!sdio_read_reg(wilc, WILC_MISC, ®)) { + if (!wilc_sdio_read_reg(wilc, WILC_MISC, ®)) { dev_err(&func->dev, "Failed read misc reg...\n"); return 0; } reg &= ~BIT(8); - if (!sdio_write_reg(wilc, WILC_MISC, reg)) { + if (!wilc_sdio_write_reg(wilc, WILC_MISC, reg)) { dev_err(&func->dev, "Failed write misc reg...\n"); return 0; } @@ -1021,14 +1021,14 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) /** * interrupt pin mux select **/ - ret = sdio_read_reg(wilc, WILC_PIN_MUX_0, ®); + ret = wilc_sdio_read_reg(wilc, WILC_PIN_MUX_0, ®); if (!ret) { dev_err(&func->dev, "Failed read reg (%08x)...\n", WILC_PIN_MUX_0); return 0; } reg |= BIT(8); - ret = sdio_write_reg(wilc, WILC_PIN_MUX_0, reg); + ret = wilc_sdio_write_reg(wilc, WILC_PIN_MUX_0, reg); if (!ret) { dev_err(&func->dev, "Failed write reg (%08x)...\n", WILC_PIN_MUX_0); @@ -1038,7 +1038,7 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) /** * interrupt enable **/ - ret = sdio_read_reg(wilc, WILC_INTR_ENABLE, ®); + ret = wilc_sdio_read_reg(wilc, WILC_INTR_ENABLE, ®); if (!ret) { dev_err(&func->dev, "Failed read reg (%08x)...\n", WILC_INTR_ENABLE); @@ -1047,14 +1047,14 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) for (i = 0; (i < 5) && (nint > 0); i++, nint--) reg |= BIT((27 + i)); - ret = sdio_write_reg(wilc, WILC_INTR_ENABLE, reg); + ret = wilc_sdio_write_reg(wilc, WILC_INTR_ENABLE, reg); if (!ret) { dev_err(&func->dev, "Failed write reg (%08x)...\n", WILC_INTR_ENABLE); return 0; } if (nint) { - ret = sdio_read_reg(wilc, WILC_INTR2_ENABLE, ®); + ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, ®); if (!ret) { dev_err(&func->dev, "Failed read reg (%08x)...\n", @@ -1065,7 +1065,7 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) for (i = 0; (i < 3) && (nint > 0); i++, nint--) reg |= BIT(i); - ret = sdio_read_reg(wilc, WILC_INTR2_ENABLE, ®); + ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, ®); if (!ret) { dev_err(&func->dev, "Failed write reg (%08x)...\n", @@ -1079,18 +1079,18 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) /* Global sdio HIF function table */ static const struct wilc_hif_func wilc_hif_sdio = { - .hif_init = sdio_init, - .hif_deinit = sdio_deinit, - .hif_read_reg = sdio_read_reg, - .hif_write_reg = sdio_write_reg, - .hif_block_rx = sdio_read, - .hif_block_tx = sdio_write, - .hif_read_int = sdio_read_int, - .hif_clear_int_ext = sdio_clear_int_ext, - .hif_read_size = sdio_read_size, - .hif_block_tx_ext = sdio_write, - .hif_block_rx_ext = sdio_read, - .hif_sync_ext = sdio_sync_ext, + .hif_init = wilc_sdio_init, + .hif_deinit = wilc_sdio_deinit, + .hif_read_reg = wilc_sdio_read_reg, + .hif_write_reg = wilc_sdio_write_reg, + .hif_block_rx = wilc_sdio_read, + .hif_block_tx = wilc_sdio_write, + .hif_read_int = wilc_sdio_read_int, + .hif_clear_int_ext = wilc_sdio_clear_int_ext, + .hif_read_size = wilc_sdio_read_size, + .hif_block_tx_ext = wilc_sdio_write, + .hif_block_rx_ext = wilc_sdio_read, + .hif_sync_ext = wilc_sdio_sync_ext, .enable_interrupt = wilc_sdio_enable_interrupt, .disable_interrupt = wilc_sdio_disable_interrupt, }; @@ -1103,7 +1103,7 @@ static int wilc_sdio_resume(struct device *dev) dev_info(dev, "sdio resume\n"); sdio_release_host(func); chip_wakeup(wilc); - sdio_init(wilc, true); + wilc_sdio_init(wilc, true); if (wilc->suspend_event) host_wakeup_notify(wilc); From patchwork Thu Feb 7 07:22:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800509 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62C5113A4 for ; Thu, 7 Feb 2019 07:22:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A7DB2C800 for ; Thu, 7 Feb 2019 07:22:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F0572C9B4; Thu, 7 Feb 2019 07:22:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C01EB2C800 for ; Thu, 7 Feb 2019 07:22:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726810AbfBGHW6 (ORCPT ); Thu, 7 Feb 2019 02:22:58 -0500 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:16865 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726716AbfBGHW5 (ORCPT ); Thu, 7 Feb 2019 02:22:57 -0500 X-IronPort-AV: E=Sophos;i="5.56,564,1539673200"; d="scan'208";a="24326887" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 00:22:46 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.106) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 00:22:44 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kNnwY4emWFsk6h1eKIox74sx1Q5Vgw1dkwXssaFQ5uE=; b=f3toPomujT7Lc4D7jmEACdZ/vjXSmC2lEHGtBR/zhcnH/qdhRzcpm55eupKF+I3rmGs5DTrNaBcU2XasR1E4Joc3m2V4KedsSaSMiSzM0Rz8P/eV162+V54VeNxMMM/rJRKMTtTctMc8HEETk6gpwLAho/TtaSUBfddphScOg1o= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB3415.namprd11.prod.outlook.com (20.177.224.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Thu, 7 Feb 2019 07:22:43 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 07:22:43 +0000 From: To: CC: , , , , Subject: [PATCH 7/9] staging: wilc1000: rename wilc_frmw_to_linux() Thread-Topic: [PATCH 7/9] staging: wilc1000: rename wilc_frmw_to_linux() Thread-Index: AQHUvrXqGKYGCUK3j0G8hXKKN7xW+w== Date: Thu, 7 Feb 2019 07:22:43 +0000 Message-ID: <1549519927-2651-8-git-send-email-ajay.kathat@microchip.com> References: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MAXPR0101CA0020.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::30) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [223.237.230.157] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB3415;6:aLAACmdCdyWcMWTJSKcNbOC9etGzDUcv1P+X0BdwfYwpAGo1Qs4WXx1AxgiRD/tsJMLhhfSsQjFPSRkcPTerynzi2olswCdYudFWrAhzkZyenAt9vrks9ZDEFpss3CsBXwVSRmASOnQ78sSbDXNwIAD7Qt/w0m/L/akkQpXPwSlKdfoQm1Y94mf9kYf5xonCLOwyhjTnJ82m3f3t5+4Z6+NydmO2487nWVvcgxiXuALBKv/AOX9ULeHUtICU1cH+chXSWG0H1b4Tll0fisGusCDeKL2cCZWdGtlo+gBrjk1UyALGcgTNPGWU6im4H9OIlk/lwDXr92pdjBjksRsMq+KzsIrfT3V1WXQm84VV6kqutxSZJ859blX3EoWtZi5I3K5ARtAnrLeqc+dEZKNfCEB0gUUCGvTfEMsS2lyhzPHBUXF6OS8RqtNVau37tyGv6hbqzvXkhG0EMSm3NhA8QA==;5:tKUVqvO1dMjGviYeY2pUzKVhrQv9xtq7Oi4yNXTbNHSnz3cNOCLsPH43F0S3qcQ4o2siv4JW46d+1vX9Ou0NXNYpOpS6itQPG7JMGAs11KUUn1QqTyVsED+IBtWr2r71WOPzv7RIOa2gF61H2SuYvGHXZE4suc6WWwl8qM9ymZuN+lkLWhvLuTBt8q+niidHIUMj06XDyjgFdpnZ3unu4Q==;7:TGzvWqMnsFbTUJWs5cQTuiaZGVGFGpEdwK+4bZL2CXx+r1uwM2YAyls7ziwNp53+cN3OafdsCaB2WAop1M0cU3ROHaLoHpxB0MWULtd5OD5t21A2oIX2uxAX44Hlu6FKF6vGDgg5hAExMTthFeV3kg== x-ms-office365-filtering-correlation-id: 5fb8cc53-5649-481f-772c-08d68ccd0c8c x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB3415; x-ms-traffictypediagnostic: BYAPR11MB3415: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(136003)(366004)(396003)(376002)(189003)(199004)(86362001)(5640700003)(478600001)(6116002)(446003)(3846002)(72206003)(6486002)(11346002)(6436002)(25786009)(2351001)(2616005)(476003)(6512007)(105586002)(106356001)(486006)(26005)(6506007)(102836004)(386003)(36756003)(71190400001)(2501003)(97736004)(71200400001)(81156014)(305945005)(66066001)(54906003)(4326008)(186003)(68736007)(8936002)(81166006)(107886003)(52116002)(50226002)(53936002)(256004)(6916009)(14444005)(316002)(99286004)(14454004)(2906002)(76176011)(7736002)(8676002);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB3415;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ATEi1bP3xsrNMdO56LfhuhKI2Kb0mEG/GEdRzFqQBXx2PVpk+mO3tLFP3V05YGvTyxwQB5ZYJjQ8hNAtxj2czYfQ54bulEY5wg33N/kn0h/yjcJUpfDyK85Y/lva9CachY0P2/UFqWHQDL9q7vw+n1nP+T4tu9k6EIkx+nSWT8QyKlihiXNlT2rptx1tAMXx2/MpuB3lAzOTr3mjY5OkCQiGjenvGrwb5onpRJBsFtdXHnGGxC0o25oVdQgB6W+nLctV7QTnRmhsTEXNRTvjZZ4wBdoT/ohSkAj9TE5cAGLiSvw/o58T5INuajwsfr36Nn5jQAd0lI4SOMXMSxl9tW46li8+FPqJbpvDouwzc80swgyjk2HGyZwiDEofl1tC4Z5Ajdu4qApkf6Jau/huJVhWW5MQYf6qdm1wWRDLy6w= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 5fb8cc53-5649-481f-772c-08d68ccd0c8c X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 07:22:40.3454 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3415 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Rename wilc_frmw_to_linux() to wilc_frmw_to_host() to be remove the _linux suffix. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/linux_wlan.c | 3 ++- drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 +- drivers/staging/wilc1000/wilc_wlan.c | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index b279811..533e444 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -803,7 +803,8 @@ static int wilc_mac_close(struct net_device *ndev) return 0; } -void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset) +void wilc_frmw_to_host(struct wilc *wilc, u8 *buff, u32 size, + u32 pkt_offset) { unsigned int frame_len = 0; int stats; diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index 2b9b8b5..df00762 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -281,7 +281,7 @@ struct wilc_wfi_mon_priv { struct net_device *real_ndev; }; -void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset); +void wilc_frmw_to_host(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset); void wilc_mac_indicate(struct wilc *wilc); void wilc_netdev_cleanup(struct wilc *wilc); int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index af1c4d8..c238969 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -717,9 +717,8 @@ static void wilc_wlan_handle_rx_buff(struct wilc *wilc, u8 *buffer, int size) } else { if (!is_cfg_packet) { if (pkt_len > 0) { - wilc_frmw_to_linux(wilc, buff_ptr, - pkt_len, - pkt_offset); + wilc_frmw_to_host(wilc, buff_ptr, + pkt_len, pkt_offset); } } else { struct wilc_cfg_rsp rsp; From patchwork Thu Feb 7 07:22:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800505 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 86590922 for ; Thu, 7 Feb 2019 07:22:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C12A2C800 for ; Thu, 7 Feb 2019 07:22:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 600762C95B; Thu, 7 Feb 2019 07:22:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C231E2C800 for ; Thu, 7 Feb 2019 07:22:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726795AbfBGHWu (ORCPT ); Thu, 7 Feb 2019 02:22:50 -0500 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:47422 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726716AbfBGHWu (ORCPT ); Thu, 7 Feb 2019 02:22:50 -0500 X-IronPort-AV: E=Sophos;i="5.56,564,1539673200"; d="scan'208";a="27377128" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 00:22:48 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.105) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 00:22:48 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sWM0girD8R8tPSTRltytTGAFAeFjb24i94pXHM1xr6w=; b=tqCZBpbxGlMC2NoSnC8xQjWYILrHRBHVk4XKEjEgyPC9yvmKdzHge1/1vkkJDKrkU9g4ME+BWJwTw2Peh7SgEI54Owgn9HiKh+b5E6KyLGtLgw43INdRqEHKlO35HmuPmzMnT+3Rj5Quv1Ld7df57jJyP+irkAtPBYxzFTK2tuY= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB3415.namprd11.prod.outlook.com (20.177.224.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Thu, 7 Feb 2019 07:22:46 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 07:22:46 +0000 From: To: CC: , , , , Subject: [PATCH 8/9] staging: wilc1000: remove 'linux_' prefix in function names Thread-Topic: [PATCH 8/9] staging: wilc1000: remove 'linux_' prefix in function names Thread-Index: AQHUvrXsRNaWhFujy0eS2YdplfimzA== Date: Thu, 7 Feb 2019 07:22:46 +0000 Message-ID: <1549519927-2651-9-git-send-email-ajay.kathat@microchip.com> References: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MAXPR0101CA0020.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::30) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [223.237.230.157] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB3415;6:eOi88eac1uyGklKa/eQ8teQUK3RAnyaxhPfQ7KGqIe+CxO24K8/nG26xWVuemGVR9xFrqcY3O9S/ZhouX3xE0i6lJq52ANXLROvFa1n6p+w3/tBDilqAV0GrelxJyGAmE1SpMP/WJWrapmlufJqyMK/tLDikeCgKjnTD0P9A60Dc9+OUlFCetV9CKFbqVuIlED+cZHXF2p8ezBmL6RfC8pKTQCQ631h8zeav+R0+ow6dm2I9Qlolhs9VYsumvpLqWfjkSeSYFkoae0Q8usp+gO91UV7Hz0rNMMzqgNQIfmYgPu1B+MD+tJYjQIS6euIygoErNLq/6n+xRNtXj2utuJnd9feh3+86mzgWojL6KT/Imd2QtxPJPStp9wRMwpkUiiHQvKI6oG1RV2toExj6XiMGtDGWv4lMdhWYgnzzDl/WxNtkVZtFBsLsEKG6wgYYSz65G3rgdusLhi9HuDcaqA==;5:Akdz6MqJxcnNMgkIRCQpcL/5Q1Ll/d82iwI7RsU5bYrGWGGpG0vxBbZ7lndiP5Jlk2JK5wY9diYPExg4hfaQDsnEQWTM5790EtGrGPTN1VuIaaYxVKMX5sp9FnMia0pQ9pm6m/s6f3FkJiNZzrCDYyKea8ZJrjPOXQHHuDjfpvbB5EDr8hRA3RRmCyb7TMay7JjBoS0gj2xt7kLWJPQwgg==;7:Zd8GuNRRWb/oR/zuqloKgYp+7DTpYxeEmJpbeKycq/3yS2xsQP/wG16ZVD6SRQhl0vjYUL9imdaLBNeThyPBG3s3Hk/mnKywPB7HN6bE+pKVzVOhmPsLncUyNpv8aG4OuT3QRa+uusoR2LUX4EoJKQ== x-ms-office365-filtering-correlation-id: c6547463-73dd-411d-3dcf-08d68ccd0e94 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB3415; x-ms-traffictypediagnostic: BYAPR11MB3415: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(136003)(366004)(396003)(376002)(189003)(199004)(86362001)(5640700003)(478600001)(6116002)(446003)(3846002)(72206003)(6486002)(11346002)(6436002)(25786009)(2351001)(2616005)(476003)(6512007)(105586002)(106356001)(486006)(26005)(6506007)(102836004)(386003)(36756003)(71190400001)(2501003)(97736004)(71200400001)(81156014)(305945005)(66066001)(54906003)(4326008)(186003)(68736007)(8936002)(81166006)(107886003)(52116002)(50226002)(53936002)(256004)(6916009)(316002)(99286004)(14454004)(2906002)(76176011)(7736002)(8676002);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB3415;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: HCS2FL/VCKYd7JBaXj/9l1V2Yk4YUm5l8ydNamUMKkpJ6G9KFszXUzJe0hD5bzU6B5I1J/W4e7ShowRf0Ty4lV/be2DJ0Iv7xzFmWzgWwCLwKBmdJcqeWtXK8oiHl6yTie2B7IJsj2W7qL7YDFz9ZUx3P256mq90KTISMSy3ztGmCw8ONSpElz3NPF7SiXWLXzaYLhUDku0UDnzEzWmOlzZrRJsIPU5yVNATHfiZj7NVvCiMBfW57XPLZhF6H05G9hcyoMypNuPWLCVb6vBs3jmohGdfxRmZj84qqnF1IfMY57kjaWd3T262WP6afInmAnOa9w3XpCHx4T3Ytob4MMmytxux9PWWgx49Dhouho1i3m1USpO+xS9phY75PN+nTKHF3t4SMu2Q9QM8PnL35j4khaardEzyfnh8Smz5DKw= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: c6547463-73dd-411d-3dcf-08d68ccd0e94 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 07:22:43.5717 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3415 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Remove 'linux_' prefix and replace it with 'wilc_' namespace. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/linux_wlan.c | 17 ++++++++--------- drivers/staging/wilc1000/wilc_sdio.c | 10 +++++----- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 533e444..5c05504 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -139,7 +139,7 @@ int wilc_wlan_get_num_conn_ifcs(struct wilc *wilc) return ret_val; } -static int linux_wlan_txq_task(void *vp) +static int wilc_txq_task(void *vp) { int ret; u32 txq_count; @@ -202,7 +202,7 @@ static int wilc_wlan_get_firmware(struct net_device *dev) return ret; } -static int linux_wlan_start_firmware(struct net_device *dev) +static int wilc_start_firmware(struct net_device *dev) { struct wilc_vif *vif = netdev_priv(dev); struct wilc *wilc = vif->wilc; @@ -243,8 +243,7 @@ static int wilc1000_firmware_download(struct net_device *dev) return 0; } -static int linux_wlan_init_fw_config(struct net_device *dev, - struct wilc_vif *vif) +static int wilc_init_fw_config(struct net_device *dev, struct wilc_vif *vif) { struct wilc_priv *priv; struct host_if_drv *hif_drv; @@ -502,7 +501,7 @@ static int wlan_initialize_threads(struct net_device *dev) struct wilc_vif *vif = netdev_priv(dev); struct wilc *wilc = vif->wilc; - wilc->txq_thread = kthread_run(linux_wlan_txq_task, (void *)dev, + wilc->txq_thread = kthread_run(wilc_txq_task, (void *)dev, "K_TXQ_TASK"); if (IS_ERR(wilc->txq_thread)) { netdev_err(dev, "couldn't create TXQ thread\n"); @@ -560,7 +559,7 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif) goto fail_irq_enable; } - ret = linux_wlan_start_firmware(dev); + ret = wilc_start_firmware(dev); if (ret < 0) { ret = -EIO; goto fail_irq_enable; @@ -576,7 +575,7 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif) firmware_ver[size] = '\0'; netdev_dbg(dev, "Firmware Ver = %s\n", firmware_ver); } - ret = linux_wlan_init_fw_config(dev, vif); + ret = wilc_init_fw_config(dev, vif); if (ret < 0) { netdev_err(dev, "Failed to configure firmware\n"); @@ -726,7 +725,7 @@ static void wilc_set_multicast_list(struct net_device *dev) kfree(mc_list); } -static void linux_wlan_tx_complete(void *priv, int status) +static void wilc_tx_complete(void *priv, int status) { struct tx_complete_data *pv_data = priv; @@ -762,7 +761,7 @@ netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev) tx_data->bssid = wilc->vif[vif->idx]->bssid; queue_count = wilc_wlan_txq_add_net_pkt(ndev, (void *)tx_data, tx_data->buff, tx_data->size, - linux_wlan_tx_complete); + wilc_tx_complete); if (queue_count > FLOW_CONTROL_UPPER_THRESHOLD) { if (wilc->vif[0]->mac_opened) diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c index 2ca6757..b789c57 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/wilc_sdio.c @@ -117,8 +117,8 @@ static int wilc_sdio_cmd53(struct wilc *wilc, struct sdio_cmd53 *cmd) return ret; } -static int linux_sdio_probe(struct sdio_func *func, - const struct sdio_device_id *id) +static int wilc_sdio_probe(struct sdio_func *func, + const struct sdio_device_id *id) { struct wilc *wilc; int ret; @@ -156,7 +156,7 @@ static int linux_sdio_probe(struct sdio_func *func, return 0; } -static void linux_sdio_remove(struct sdio_func *func) +static void wilc_sdio_remove(struct sdio_func *func) { struct wilc *wilc = sdio_get_drvdata(func); @@ -1127,8 +1127,8 @@ static const struct dev_pm_ops wilc_sdio_pm_ops = { static struct sdio_driver wilc_sdio_driver = { .name = SDIO_MODALIAS, .id_table = wilc_sdio_ids, - .probe = linux_sdio_probe, - .remove = linux_sdio_remove, + .probe = wilc_sdio_probe, + .remove = wilc_sdio_remove, .drv = { .pm = &wilc_sdio_pm_ops, .of_match_table = wilc_of_match, From patchwork Thu Feb 7 07:22:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800507 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 05F5A13A4 for ; Thu, 7 Feb 2019 07:22:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF8B72C800 for ; Thu, 7 Feb 2019 07:22:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0EAF2C95B; Thu, 7 Feb 2019 07:22:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AE242C800 for ; Thu, 7 Feb 2019 07:22:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726797AbfBGHWx (ORCPT ); Thu, 7 Feb 2019 02:22:53 -0500 Received: from esa6.microchip.iphmx.com ([216.71.154.253]:10641 "EHLO esa6.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726716AbfBGHWw (ORCPT ); Thu, 7 Feb 2019 02:22:52 -0500 X-IronPort-AV: E=Sophos;i="5.58,342,1544511600"; d="scan'208";a="23532162" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 00:22:51 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.108) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 00:22:50 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cFta4Ih6QzZtjVebbTl/H7wybiKCFV5tw/NfcoFHJKM=; b=qdUXtz0DDZkaCcq5ZAD0BAbpsECXlf4SqBcqGm51MBLu1DPSMGknK3+Dj8x6nvOGZKwMidziZbP++W9fUSKr48Vu8jsoe1LrJJtFzvjXidHhGgNJQwSZ4P+7aTlTAZwsjUwV2pdTmomaH6ZTKMiRC6zRedynGraecxi1fMRAhiw= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB3415.namprd11.prod.outlook.com (20.177.224.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Thu, 7 Feb 2019 07:22:49 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 07:22:49 +0000 From: To: CC: , , , , Subject: [PATCH 9/9] staging: wilc1000: rename linux_wlan.c and linux_mon.c Thread-Topic: [PATCH 9/9] staging: wilc1000: rename linux_wlan.c and linux_mon.c Thread-Index: AQHUvrXuAeZ2YGODBkOlyqiEnqsMMw== Date: Thu, 7 Feb 2019 07:22:49 +0000 Message-ID: <1549519927-2651-10-git-send-email-ajay.kathat@microchip.com> References: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549519927-2651-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MAXPR0101CA0020.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::30) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [223.237.230.157] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB3415;6:IoqeyU8hdsMcU6LbFDfzUTuIEdAIGPPvGZ8zbCMe+SrWcYbmgfdLvCgCBNVdwyOJAczHnZwBc1XW6Db82yW6tDY0EvKGiALmzlARDJJr6n5k9AecnMOjBGMJ106ZbhHCiB6p0JffOANfdVlOeoHwtZm8bbIHLrvFbBnzBHeUN5K3ChX9ZF7DH2CthYZrmDGI7gU5T5Zp9Bvdi6aF/aUOornuXoCfadK9k3es4ZobyJHCEF0/fvWywCnAh6OqDLucllIRh6jV1h76OHOX0SmZs3gKDrObDceXbZdCI7ZliERcb8N09lhi3uc5lBRPYi3XSrcFB6/xOTHd/f63pVturmHHkx+FCHB7/m7oT2ndcu4BLRv8ZU9jeE9AtPFy1oRTJR9xf9Gjn697MaQRN9kW19I5QJsJI2Vj7jI2qzkbe89UymuAPZSuREKYxFFTF+t5CU6Z7pgCZkJ8TXAxmYoz7g==;5:qFbKcYKKAyZr1Pr1Kc/YhT/QITaZleDKn4RAmbHLoJiGKzBl7/vAccfVo2gxk2Iq53QDNKrCRfHEMgj7Ohwtf1E12DXPN1J+xSTRr7XGqZf9W9G1QBcPvJaAg0YkKAgSHCtVTLe2SNKic6aU41gJFQTrbIRSxNEgXMLMbMrK5SsDukkxjBl8Xk20kRNGp4N6oApy3BsPOZ6GCAah/rDaVw==;7:TDc3KFxaaI3W9xIoQEYTXK9hMrXV01oH8H6RoFj0VdpxHF9ncYksP7khcRR16ZcTRbIOpOhL1nfFpNpsl50maZovagp0u6LzlvHig4BjofOSrU8t1oGF6Jl+vz612BJQ9YgvaWTxf034IW7bz0baWg== x-ms-office365-filtering-correlation-id: c76e276b-bb34-4a3f-58ab-08d68ccd1070 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB3415; x-ms-traffictypediagnostic: BYAPR11MB3415: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(136003)(366004)(396003)(376002)(189003)(199004)(86362001)(5640700003)(478600001)(6116002)(446003)(3846002)(72206003)(6486002)(11346002)(6436002)(25786009)(2351001)(2616005)(476003)(6512007)(105586002)(106356001)(486006)(26005)(6506007)(102836004)(386003)(36756003)(71190400001)(2501003)(97736004)(71200400001)(81156014)(305945005)(66066001)(54906003)(4326008)(186003)(68736007)(8936002)(81166006)(107886003)(52116002)(50226002)(53936002)(256004)(6916009)(14444005)(316002)(99286004)(14454004)(2906002)(76176011)(7736002)(8676002);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB3415;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: kmpMxtbLe7kXKMj+TtDeMsLu78450zSNIuwCAfY0AzLqh3fjwZ0NpRwTWxuV1gUbcgBvUgZ3Qjlaw3XhtECjlpmtZGrFBzfUOPlwmr0C+o4hiFe6IqD4huFwW9j5Hh8y+EUUGUCVXHeqaJLfZiKzMIkW5DVn82fC3/cfCTzmwFPNdHxlYF2wb4d65715wbIq6CGRL3QfhuNjzy8Ic4vyFSXg2iZ1Cf4YUzVHPgAOD9k2qQ2Cq6PaVhkrN1yV5aMLGmzdfBDN/kWM5inYXWZL2Z5bY7CyIIjDl3b0RQPsUQCjIyujdpDmdo+q95InjeX9Jvwfsdt8MfVWt/sZgbvtrJFOPE8NxQ7x4eKU2GYuvpK60+fmcnTNUg2v+JRK/w5R2UlNxAfbPH4m2w3RDt0KOLYNXNZfEpsh//ZAj0PPcW4= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: c76e276b-bb34-4a3f-58ab-08d68ccd1070 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 07:22:46.8820 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3415 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Rename linux_wlan.c and linux_mon.c to wilc_netdev.c and wilc_mon.c to include 'wilc_' prefix. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/Makefile | 2 +- drivers/staging/wilc1000/{linux_mon.c => wilc_mon.c} | 0 drivers/staging/wilc1000/{linux_wlan.c => wilc_netdev.c} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename drivers/staging/wilc1000/{linux_mon.c => wilc_mon.c} (100%) rename drivers/staging/wilc1000/{linux_wlan.c => wilc_netdev.c} (100%) diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile index 72a4daa..2ad3fee 100644 --- a/drivers/staging/wilc1000/Makefile +++ b/drivers/staging/wilc1000/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_WILC1000) += wilc1000.o ccflags-y += -DFIRMWARE_1002=\"atmel/wilc1002_firmware.bin\" \ -DFIRMWARE_1003=\"atmel/wilc1003_firmware.bin\" -wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \ +wilc1000-objs := wilc_wfi_cfgoperations.o wilc_netdev.o wilc_mon.o \ host_interface.o wilc_wlan_cfg.o wilc_wlan.o obj-$(CONFIG_WILC1000_SDIO) += wilc1000-sdio.o diff --git a/drivers/staging/wilc1000/linux_mon.c b/drivers/staging/wilc1000/wilc_mon.c similarity index 100% rename from drivers/staging/wilc1000/linux_mon.c rename to drivers/staging/wilc1000/wilc_mon.c diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/wilc_netdev.c similarity index 100% rename from drivers/staging/wilc1000/linux_wlan.c rename to drivers/staging/wilc1000/wilc_netdev.c