From patchwork Fri Jul 10 05:18:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 11655667 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DBFFB13BD for ; Fri, 10 Jul 2020 05:22:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BBCF120720 for ; Fri, 10 Jul 2020 05:22:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="Y+UOQuPN"; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="rmdZ6TfI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726872AbgGJFWT (ORCPT ); Fri, 10 Jul 2020 01:22:19 -0400 Received: from esa6.microchip.iphmx.com ([216.71.154.253]:1798 "EHLO esa6.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726341AbgGJFUH (ORCPT ); Fri, 10 Jul 2020 01:20:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1594358405; x=1625894405; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Ec1PxbQI2xCr+MxUSecivPaE6jbygJqpEDQ4sKDj0eU=; b=Y+UOQuPNPzXIPJvUHqkUw9wbWIDRBex4DoCsNJPMDssaau4zlP1p6PLT xswJSys9u6Lpv2TJQ5+oXn5QbCDusW97Djf4/LhM7zWjtUSZOmiJiEKdD ZVUNDcHL4jili4PkjRsHkRrcmLnko8P2CHVJHQwaeLujRUFR/pnjG74Lp vP6XiXdgthldm8z/9Y5Z+CMvbfTjfpiDSsvw7/D9w0qDxJ/7iNTw9Sygq 6ExSGUzw5A1pmtcWzJiE3UQmw78eb/MJczm3iRKTa7N2VYRMHHxIBvjA+ y7YBKnM09u2tMQLv0dE84o4ZLNR4bklR4IE/lE22rImjmH19KAulSaxpM Q==; IronPort-SDR: 1DyXo3IXrVldu9AvK8Iv6eABqkhhL2iG3ApAxks7a02nAlBiHicUdHWON8sbWFJbLeuyel1IYJ MzYnCnHQAExmNWfcoUgxI09s+c8DzSR0folSzeqvOnIVF4DGU9Ikts2P2vahtbwayAbNXsexae UmawfYe2qZkg/UpJbgIMJ/vvwVWI1jzSSojnW1DQZjmj7E6X12e/XUjqMKGE2C666s1SbiL10u SBXwxaa8xU+nrS6QyJMqVtPs6Ww113fyNvVCYmaKLGUhJTL7V4JIRx9W8EvAHfulJMcJK5XImo 5mM= X-IronPort-AV: E=Sophos;i="5.75,334,1589266800"; d="scan'208";a="18638118" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 09 Jul 2020 22:18:33 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 9 Jul 2020 22:18:05 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3 via Frontend Transport; Thu, 9 Jul 2020 22:18:06 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V4zwqdSLgagbqKRuSQ5A1qWNw1MQN7KdMQtVcAawus8puO7s6Qlbe16DpTHr/6KJZWq2U77fQsci+IFVlIJUruPCOIYMmczeVip6IfVTaprtOmWsCiryalp7pypThIOuGZojQf5roXlGvXOtGg4aP0Ut8ObkcyXuZL3Q6AzVKVxUKWbwLnYAEGJ6ympPsijhA9EMEpSVB8B54VrgC7rnu/U2uF5z3tZRxkqKjccSApc2yyk8wRkXnt9loY/qOl9Wnu3538XHz16NdnY33ZgznYv46QdCOTk/O1+Mv7Zfjycj8gLma7FyL83A7IyAlIYt7u0hi2yWGfXdVQ+qAgH2Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Zy/fXLUMRYf14qxT+HjrNFiumBYc221wFEkVX5H6NBM=; b=GfuYRw41bPYIflHfXE6XWJVTSEQMm9kJV/0fFS6X77l+Vl7k1O7Aa4Q+SsOPT2aGL5+7CLdbMIEbrH6VYN5Z87bJCoa9gNUJQ+wKyZf1nYcKDZqg340Wh5ECvGD46Su4scKAw7qKocNxmfoO/x/vKUHVuwdvj4jQEgcE4gfX1cLGkG0UWcSw34gT+jIMaYtDrgcET8coNf8vgsAbluKlg3LerI6+kGacu5WFD0jfwdX6UIgregiN7fogtPpD1HXqEgK7p/g7My+L4ySn89msHQsDKnSJKwCNeLk81O1lSPUveIfzPsq0ntvJf88CzkiLu3mwA3pE+nenIlg+I3hrZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Zy/fXLUMRYf14qxT+HjrNFiumBYc221wFEkVX5H6NBM=; b=rmdZ6TfIw5UeKBtYCZVb9RvqrgTjLWAqlzBf35PrhuieOd5pUSuIpxmw5po+uSZWozwxXBIwbnXH6nBMMp6LHncVuxVDoQ3AOhB6cHwtAmvf5Oq2MTst80QdmoYAltHN6LedjCnT/qprdav0zp49EcX9B6Qq1lvXSDuvFs1WQtU= Received: from MN2PR11MB4030.namprd11.prod.outlook.com (2603:10b6:208:156::32) by MN2PR11MB4128.namprd11.prod.outlook.com (2603:10b6:208:139::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Fri, 10 Jul 2020 05:18:29 +0000 Received: from MN2PR11MB4030.namprd11.prod.outlook.com ([fe80::3874:6ace:6aec:deed]) by MN2PR11MB4030.namprd11.prod.outlook.com ([fe80::3874:6ace:6aec:deed%7]) with mapi id 15.20.3174.022; Fri, 10 Jul 2020 05:18:29 +0000 From: To: CC: , , , Subject: [PATCH wireless-drivers-next 1/5] MAINTAINERS: net: wilc1000: Update entry Thread-Topic: [PATCH wireless-drivers-next 1/5] MAINTAINERS: net: wilc1000: Update entry Thread-Index: AQHWVnmMPuAU4KVFeU+r3jzuwtgylg== Date: Fri, 10 Jul 2020 05:18:29 +0000 Message-ID: <20200710051826.3267-2-ajay.kathat@microchip.com> References: <20200710051826.3267-1-ajay.kathat@microchip.com> In-Reply-To: <20200710051826.3267-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.17.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-originating-ip: [49.207.205.82] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4af3b1a1-be9d-4bca-cc76-08d82490ae8d x-ms-traffictypediagnostic: MN2PR11MB4128: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-bypassexternaltag: True x-ms-oob-tlc-oobclassifiers: OLM:3513; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: h3mhzVVbgEixIX2zPh0DKKB4SmI6TBaMarDJ33rQquqkGOHaKqn8nIdGEGuOwiUoYTf3W9op31wLqVbP9HA93sUwATW8Mntj3FDNPBRiSjfawNnqBlX3vxx04xroKrlKueGSEDSBegEAypdGIongWwmIaEAbmDN0cZEIb+SFsfcplkBsfcml4SrjslFuaA871pd8Q/kbWJSCrqnzFaA/S9R5QFtQEgcWuVA6qa2TulW9dFYXAQdA6cPUS7JWhURcga1Gb4vBWe9O2y5DlitdH8eMDtp3gDUAgcSrA1MvdUaB7nPoMh+MOOaXfnr9C0NA7HIZ1KAaKqNygPsEzd4zbQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR11MB4030.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39860400002)(346002)(366004)(376002)(396003)(2616005)(4744005)(36756003)(186003)(6512007)(26005)(66446008)(66476007)(83380400001)(66556008)(8936002)(71200400001)(64756008)(8676002)(6486002)(2906002)(4326008)(478600001)(107886003)(86362001)(316002)(5660300002)(66946007)(54906003)(1076003)(76116006)(91956017)(6506007)(6916009)(55236004);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: jxsE2GHeemAH1OGkGc6oRTx0ELAu5Cfu3SrJ2Y0dt/OmwVl+wGz+qR/c+KEfhlvJjN5amTYuzEZnqRbpd7wIQXEiBs0UrxOBFe8x+hFgg+BQW/AHpicjPQtgq5SX1lKUNhmFJSJFbfUUsm9SohAGOsUpPAfd9vJoJ/OdCbUcCGXKxgLAUcD/6WZi3H3R8iiPU8X/WKdUuZgfA/4WhUxOzvKobpqZ4yMeNncevLj6BwpkritZ3uNm6eLwD22sVz4H3/xpW4puem+dOA1TjTmTGr9F1T6RIFrlvh0uNqbNz6A6NaYyOlZAGpNtbs+QTL/AfAgatWrx1u6rBfIlby0Y5/1cT2UIVWPiwvLx0LDpQLHVGnhPNZfh5C1YPqZvcMMl02WDFMcVIckTOtxPvh80UIY7d13vt4xZSBsJI6EJoLbZWmOZnaDuHpLmqiot+B2GgpCNQ0epC22kU7gx5ge+91P2yvU4YmpKdpnM1unP0x0= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR11MB4030.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4af3b1a1-be9d-4bca-cc76-08d82490ae8d X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jul 2020 05:18:29.4854 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: D6pfUoKfvREEsiESBbjqd3pcraeqzkQ6WUuFywldkdF0Q3a4iPCxB5Wa6L0pTc1Vkvj0p6TImsxRE7cMWMfKD7wRczzQmc4H8Sn2OIlZHyI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4128 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Nicolas Ferre As Adham's email address is bouncing, remove him from wilc1000 entry and add Claudiu as a new co-maintainer. Claudiu follows wilc1000 driver development for a long time and contributed to it already. Signed-off-by: Nicolas Ferre Signed-off-by: Ajay Singh --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7dae51e32254..099e672ec6e6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11363,8 +11363,8 @@ S: Supported F: drivers/usb/gadget/udc/atmel_usba_udc.* MICROCHIP WILC1000 WIFI DRIVER -M: Adham Abozaeid M: Ajay Singh +M: Claudiu Beznea L: linux-wireless@vger.kernel.org S: Supported F: drivers/net/wireless/microchip/wilc1000/ From patchwork Fri Jul 10 05:18:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 11655661 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9A35D14B7 for ; Fri, 10 Jul 2020 05:20:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 821482076A for ; Fri, 10 Jul 2020 05:20:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="CD1QAjax"; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="J22od5fm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726774AbgGJFUl (ORCPT ); Fri, 10 Jul 2020 01:20:41 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:28889 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725943AbgGJFS7 (ORCPT ); Fri, 10 Jul 2020 01:18:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1594358339; x=1625894339; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=OJkYJEjqBdX/hZRKoSzOjW0UkkpwScYBqnXbvUZOvq4=; b=CD1QAjaxsZI12GoVmkbFQudsW8l+Uki+FXERDZSNHNJtAkgBHfjwG61t AguwUiNg3zyl4TizGw7mO3lbGGTf0g7eFUHrq1aeTBCWlkPFaUwvkrqy4 qwMDP+qtfYfygwjflpFekclpQMmWY70dunKLQbODwNW3VMwXCRqrgJiw/ Ivf3ei7br5hIrYCfkUIYPq2wlM243/R1DqrfKL2AJSVqC2Uhf+FFTY5tX aaangBel+VGkuIonxHAZaPPcPafV67+0Z4jwuZ5jmt/gLhr6yp3e5s+5z UY0j4Pfkfg/TYN4miV5pWkKMz470ufstQhjvwvrA6TX3kh17qiZLl20Kp Q==; IronPort-SDR: GcydowhgePmAAGpgg2cLYv2ITHBDl9Zv+tPtTHuaUF6d2Xn2KwWC/9I3hEfJp/8gT7bfvjkLH5 BoYlcq3u7Y2Sz4Yjpe/PVAsQCfmQ62FKfRaXWxrz3TFfDeQCyUWQGn6Aj9pG0UPYlrzC/KNaVu iJpCgJGxUk6HxXR7P67Q8IBis9sHCq7ZIqNw2DI/4DhY4vwrRh+ujSD9zgmvte8rqF8pCXL9xG E5BUvNCXWPt5EL1YlY/Z6rNeq+Lz35GWwmuPbcNVTTL9LL845GS34hj0Fo0Wsj5igd+FDC1w18 8ws= X-IronPort-AV: E=Sophos;i="5.75,334,1589266800"; d="scan'208";a="82539358" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 09 Jul 2020 22:18:34 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 9 Jul 2020 22:18:04 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3 via Frontend Transport; Thu, 9 Jul 2020 22:18:06 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DT+0AccF5QqD9bPT2WLiUmsJapOMrGob9zHgrFnzhvVDSzc/oAjbUiLfYMIWPqDZeoLz0HACixoKKE8g0qbAy1HdNZYxi1VrjifY1oKDCHDbSD0WXyni0mNkVpfzzItIUcz3z1tbeLiNv6SjvV7ljeLnDQ7haSlRCOr0K6qGrL8T6U1CEcFT1kGN13VulV8vcdb/87wptk6PRHwfDctVnuU7hU7uUT5035raKM81xhuL5O6ER9lFAJbEjhIARjLE0oE034M20ZVqeVT2nMA+r6DkY61xBG5Fkb1gEfvaivBl1tBHj379i8t0ewTIvs95sAFNaU/mjZ7xJs/rs5U+Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4Rm8Uos4S8t0WAyaMJnoQ7WQ3jHcu40PPhuyDVFA+Sk=; b=X/W83h6nX543Aym4NBBCYngKMHKfC+UwzmBKjuDL2qnep5X9sYrHxCQoFV2OcwrH64BqIDtQ6rk9LGQ6pfEnN/G2PqJaPYlwvaZkyKcFUDW85ZoVc+nxb1K64uM6Z9sgB4CJEKUG53MBeW8F5UoLPKqICjpyYJK71SGwjbhdvmYO8zL0Z4nUoDneAwRDoJNVihbYtf+dzM5VswTu7Pp0SxQRWRX4LPXlvN7eQQLyGtiYIq34Iw0ni6Ug5eW/a0n2qTrqGHYelb00mx0vDKvF5MN3XjkHSbjoRLMPfa2XFAF5AQCpFI84PAcMXpjnYG8L0MHDlL/kmszt7mhVqLanWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4Rm8Uos4S8t0WAyaMJnoQ7WQ3jHcu40PPhuyDVFA+Sk=; b=J22od5fm28F9FSyemf4q0AYXvrFX/0BTBpBLiLmNNDWTo+5FYCacSmvqZ0Qy5IuebUFpf8l6PZYJboJ+UwYtOulylmD3yXDWUZLKhh5o3CnFNBH7i4vwGk8N+PNU0ELFSe0z5sUoKWIBsjK9/xTQkQwlXJqAfWI0nnPiY+sOdAo= Received: from MN2PR11MB4030.namprd11.prod.outlook.com (2603:10b6:208:156::32) by MN2PR11MB4128.namprd11.prod.outlook.com (2603:10b6:208:139::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Fri, 10 Jul 2020 05:18:30 +0000 Received: from MN2PR11MB4030.namprd11.prod.outlook.com ([fe80::3874:6ace:6aec:deed]) by MN2PR11MB4030.namprd11.prod.outlook.com ([fe80::3874:6ace:6aec:deed%7]) with mapi id 15.20.3174.022; Fri, 10 Jul 2020 05:18:30 +0000 From: To: CC: , , , Subject: [PATCH wireless-drivers-next 3/5] wilc1000: fix compiler warning for 'wowlan_support' unused variable Thread-Topic: [PATCH wireless-drivers-next 3/5] wilc1000: fix compiler warning for 'wowlan_support' unused variable Thread-Index: AQHWVnmM3r1PCATXhEWvwUrMYmvu6w== Date: Fri, 10 Jul 2020 05:18:30 +0000 Message-ID: <20200710051826.3267-4-ajay.kathat@microchip.com> References: <20200710051826.3267-1-ajay.kathat@microchip.com> In-Reply-To: <20200710051826.3267-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.17.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-originating-ip: [49.207.205.82] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ca4d1de9-1d2f-4614-f8e9-08d82490af30 x-ms-traffictypediagnostic: MN2PR11MB4128: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-bypassexternaltag: True x-ms-oob-tlc-oobclassifiers: OLM:296; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: a6MfX3XVlS5mIxBXkfVq7QovgLaSXTB2efEML5HWE3vMg6nql8LZoCSARkGFgZjSb7bWi5acGTVBfgfnjyZVIxU1btuRfht0Z7JffcGSeRQ4x4UPz4hrTDB4tPfyGWaNdiTAyfqOmq7vWAQUVFBlzQZ8c58CbpYTJT1nuDLIvkJzugR3aY8IoqUmhdja7oB9SntiVfiUeUJyFL9jwRhr6Ugx4NcsDo/7sB5am78VVpyb65enZLxaYCfeWEuvb0XHj1Ck6v+T8UAm8IH3UiSD0meu6a2vMmZxxcAfDTNTypPSsXu4bWdSzpRDjqDnCAjX x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR11MB4030.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39860400002)(346002)(366004)(376002)(396003)(2616005)(4744005)(36756003)(186003)(6512007)(26005)(66446008)(66476007)(83380400001)(66556008)(8936002)(71200400001)(64756008)(8676002)(6486002)(2906002)(4326008)(478600001)(107886003)(86362001)(316002)(5660300002)(66946007)(54906003)(1076003)(76116006)(91956017)(6506007)(6916009)(55236004);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: SAB4OCgDapj7bmYtSevNrbZB/EiTB6Xr2yj93UzEfsBQqUZxMUOTD2V3MDGQRRXC1T7elZZw5U3gtcZ1DkTVT4KSmF1aCAn2tMX23vzkmao3nagUwgeDI/6MLbcmzIfJTBsmOVRBnw4uU8vwurLJumG9yR3cO0oZs/NtYD9bJhrd4hi8uMoDpzuWahyBiaiHemHTa2F84zTyH670P1k98RNMV9qEbOOpxzFRQ6kNVo5J5Elb2W7X5/KpvANm7b5VPq2OLktxpRB0ozqPGR3gFYnBeyB/3NJBEu3rhO6OwbUsw/pJwu8Pe4D17gvvHoRi1MY9EQbImyfroAT9pkDtDWH2cW6KmW3xiIYrQVDh1GLEQ7Pvp27oULtDBy8WKQ6CM2ZF6xjTljgnr0cIGxnS9Ytxa3nmLHcAPqN/jJrNJh/SmRLok8ne948jJUXpuzxqTeCNssx43PTkEFh49gXN5TK0hodOvzKUs5HCxWTwnNBPlmjkHhS4dA3q6u3tXjNA MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR11MB4030.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca4d1de9-1d2f-4614-f8e9-08d82490af30 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jul 2020 05:18:30.5668 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: a5oh9oUTICiiud+T15pr3fK3DsR/SqFJY6wRh2JR7rIi679KKM+6y7vRVNxWH+5HLJMDL+QzwyCuVqTrnNxe8IDWFYnt661mwwgJudtss5I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4128 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Avoid below reported warning found when 'CONFIG_PM' config is undefined. 'warning: unused variable 'wowlan_support' [-Wunused-const-variable]' Reported-by: kernel test robot Signed-off-by: Ajay Singh --- drivers/net/wireless/microchip/wilc1000/cfg80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c index b6065a0d660f..c1ac1d84790f 100644 --- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c +++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c @@ -46,9 +46,11 @@ static const struct ieee80211_txrx_stypes } }; +#ifdef CONFIG_PM static const struct wiphy_wowlan_support wowlan_support = { .flags = WIPHY_WOWLAN_ANY }; +#endif struct wilc_p2p_mgmt_data { int size; From patchwork Fri Jul 10 05:18:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 11655663 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 34C3713BD for ; Fri, 10 Jul 2020 05:21:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13AE620720 for ; Fri, 10 Jul 2020 05:21:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="MUZmXdHX"; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="LiDDhxWz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726830AbgGJFUs (ORCPT ); Fri, 10 Jul 2020 01:20:48 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:28893 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725966AbgGJFTA (ORCPT ); Fri, 10 Jul 2020 01:19:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1594358339; x=1625894339; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=EwKxLflnNQ3Cs8U/J0bt4/m/SZ1h3tDv0qw7rVVPBnI=; b=MUZmXdHXN35T8Jq5kojilFxvO/KNxo0HnKlro9T21A7ddS15O5F03ORF +f/gnapI/2f+NJV9tVOBlUvy6Ax1IiMtOiOfGTgLP/zcU/0ocgSHERR1d nAarWH9tIsGJ6fy0ye5+bWpd5X/rCXJ5DlREM5wie7e0bJVDQB8ZV+LTK 1hQQFhgjuMm8CEbtzNA2t4OBWRVpDBTosWbWDp58e3YD6O0PhHSWKInpt SBOkzW/1eCV7rSe8RSHXqk3UND4y1gnctCM5xLaMAnQwE83Hd5B2hzfW3 /KLevyi9KA+8rD5Trm7H0EEf2HLcvSe9mxxa+FzvvZml3vH0DKLznZNV/ w==; IronPort-SDR: 1Yw0iO/a/QqUbS6GbhqnEOT/9vXltmKFdD7CBDGLYRknnJYnNrl197CJccBiDcMxSdVE3ilXUp yNt9tceFaW1yEKMFoIiWUJ7WWdSqkGxIz2J5vUkmf6kAcg7yvVVWLjW/lx+sJrouMGMt3GWpcc rBjnqFrtINcnzblJKNsKLxalMD6CDFUMW4Ve9McUjued+wY3pnF8j7ZP8X1kn0il7OzsFQI1X1 MnZSIkUt2cD+pIHzrX1PI3Iv2qa0A7bQK3DZ1PVy9Sj/Rt99XJBEaRWXrzZuOD+bWaciy9cEkg N8g= X-IronPort-AV: E=Sophos;i="5.75,334,1589266800"; d="scan'208";a="82539359" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 09 Jul 2020 22:18:35 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 9 Jul 2020 22:18:05 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3 via Frontend Transport; Thu, 9 Jul 2020 22:18:06 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sc83JrsEd9breS0N9EKHiv95o77+kNRzU0rBXkT/o0IJN2u/6al1JZJ90zTRaO919Ai32C7byPTA9rVKeKfZQms5gc3VP7b4lyR7u4yWV/zfp0deHf7XaJ927vSMOxdcBNRowy9a87bHlOLc98o7V9eTD2grfkQJCi/kIC3YI2ox7RjOp7ZkYQ5ydaOj7i8os/peA2xFbIyknBJFUgbHKJRB3O8gWfQ+07B06MQJri1Q71jdZR8EdJ6IeWxZTqcazOKCU9WWZ4Pgm7iNmfieD7NmZKZkQy4J90sTogMETujJzQGHsTkWGBS9zyWATM06xDL0FWfb88gKkSxXro4VMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3LAzlgkGYqEp/t7GEl2gBZC0wzsfGlbME5+41aHIxAU=; b=X0PsIqnQ75UgQbLMF3eUzwInqsLKSLjThtq6l5mbVaaJbokjOLalJ2pmDGn2NyzbPeVPnzzinYR3DB4hXTYTJcB1VQBq0/aIqJniVTFn/yNkVQet5Qto8QEBwdJ20aIdromfBshvpg1cAiwBxaxQDBuD4+bZWEMm0jcWRWJmmeXM82aIS6+nmLCEc1IqXbug40gjwPVkHFqDH6k0e2CnbYdBSgyS6JvqLvkqtZn/sBrvPo2q2qTuzi12IGs4pPefCd0nGXxbgW8KBUO374ZQVSqNnWMZmQuhUSyyzpOV9WI/zXAMXKHNYIu/GY/hS3UaYPjtmmq/KwLcCjBHl0KUDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3LAzlgkGYqEp/t7GEl2gBZC0wzsfGlbME5+41aHIxAU=; b=LiDDhxWzd0E1KXsl36J03Dgyw5Hl9UERLX3X40Jap7DALgABt3JMZ2QCxbQ0TluTCtZel1soZtnneUl+Sjz3v+D2enOZVNPtkQyFzP3YXwKg7qGscm6OrJHlDWx6cq/PiGlTQW3jHkaPoqNF81G52DCRUpywjuvdd4GxbS5oSAc= Received: from MN2PR11MB4030.namprd11.prod.outlook.com (2603:10b6:208:156::32) by MN2PR11MB4128.namprd11.prod.outlook.com (2603:10b6:208:139::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Fri, 10 Jul 2020 05:18:31 +0000 Received: from MN2PR11MB4030.namprd11.prod.outlook.com ([fe80::3874:6ace:6aec:deed]) by MN2PR11MB4030.namprd11.prod.outlook.com ([fe80::3874:6ace:6aec:deed%7]) with mapi id 15.20.3174.022; Fri, 10 Jul 2020 05:18:31 +0000 From: To: CC: , , , Subject: [PATCH wireless-drivers-next 4/5] wilc1000: use unified single wilc1000 FW binary Thread-Topic: [PATCH wireless-drivers-next 4/5] wilc1000: use unified single wilc1000 FW binary Thread-Index: AQHWVnmN/7GFufJWcUuxIpCgE4RRPg== Date: Fri, 10 Jul 2020 05:18:31 +0000 Message-ID: <20200710051826.3267-5-ajay.kathat@microchip.com> References: <20200710051826.3267-1-ajay.kathat@microchip.com> In-Reply-To: <20200710051826.3267-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.17.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-originating-ip: [49.207.205.82] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 93e9e3fa-c8da-43af-d43d-08d82490af86 x-ms-traffictypediagnostic: MN2PR11MB4128: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-bypassexternaltag: True x-ms-oob-tlc-oobclassifiers: OLM:196; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: jko5nE4unCvQugBte5QZ3XL9LKAk1ed8GnOSNr8J0xLwgObBq8WNeyQQBX/gZdGHa1tU4pZZOff/3KeldrnTiJK3vmsvBTV0kD5tIzuXvpF+d9skaySkC8B9HRI4uoAA9GrOFGwBXKPngzbDTdR7pfJk2DtXj92bsJ53keQG2oij82ctrKFq6XveoR2j5JMCDQYmLuVz38atCR9wug4XS4BOHlo/4PFapeq2SFXxFsiXZOIrHsAajJC/JWJphAYuP898of2RI5ufGfTBikgo6tiSridO6NRVyYLxk/GVIo0zhEyAgfIJOgQwfbzLBVKbgg2Oxa0tjEj6cA2u5P/h4w== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR11MB4030.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39860400002)(346002)(366004)(376002)(396003)(2616005)(36756003)(186003)(6512007)(26005)(66446008)(66476007)(83380400001)(66556008)(8936002)(71200400001)(64756008)(8676002)(6486002)(2906002)(4326008)(478600001)(107886003)(86362001)(316002)(5660300002)(66946007)(54906003)(1076003)(76116006)(91956017)(6506007)(6916009)(55236004);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: XPJFariYAaRg/paxrZoJPG2H86Vutkl5MbsIXuhfcitaigSVIr9uDGPyee6KRpiJcYB/H3Mn4Ymt3qD+/nd8h0HzizwJ7ibof1Dp8HXYxd5YHphsXovOUEVsVJeLoFbaU1BoiYoy/i0ilN2RsqlMj294InnHTb+eV3f/Kl5TJwUJCA20RC5n3OHVm2oyQJh4UhOU0naPR04/+TP5he9hUi8m7SWiWCX9HQ+fYooChBFindwMzAjDmpSv1SYwvRI0dkQtxXamldHdZtqU7Jmg8RrknWK1/4agHNoBTxUeWKlgF2y3Sy15t0uiYm6V9u4LDDDGpP+SaoDGL5iSlOnxzFmkFcC/KLsAAyghUdXOjz7nQdfgaBQgU4GKWqyng4xr2eYAn5O9jv/S7g1lIcKUZgYutCi5J7H7w45E4+SMqHlA+KT0wCEisdEmumhaJTlnm5ASGwlJy3RDf05vhF0MN+QBeHkI/PIu8bGB+e+a4UtxnWpcO1+gjxSjLHjG3Wrp MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR11MB4030.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93e9e3fa-c8da-43af-d43d-08d82490af86 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jul 2020 05:18:31.0945 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: sWhVH9Qe8iTvpRycnkd50lVA81yYyQGw1TC9NeikNHE5G+lgy8f3sFmCNS4pjM3Lospaa8eHTINS/fnSkaaM9u1nmTY7DXDSKatbiPmkNw8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4128 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Modify WILC1000 binary filename to use single unified wilc1000 FW. A single wilc1000 binary is used for different wilc1000 revisions. Signed-off-by: Ajay Singh --- .../net/wireless/microchip/wilc1000/Makefile | 3 +-- .../net/wireless/microchip/wilc1000/netdev.c | 18 +++++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/Makefile b/drivers/net/wireless/microchip/wilc1000/Makefile index a3305a0a888a..7d1ed5f40cbb 100644 --- a/drivers/net/wireless/microchip/wilc1000/Makefile +++ b/drivers/net/wireless/microchip/wilc1000/Makefile @@ -1,8 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_WILC1000) += wilc1000.o -ccflags-y += -DFIRMWARE_1002=\"atmel/wilc1002_firmware.bin\" \ - -DFIRMWARE_1003=\"atmel/wilc1003_firmware.bin\" +ccflags-y += -DFIRMWARE_WILC1000=\"atmel/wilc1000_wifi_firmware.bin\" wilc1000-objs := cfg80211.o netdev.o mon.o \ hif.o wlan_cfg.o wlan.o diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c index fda0ab97b02c..1005526ae896 100644 --- a/drivers/net/wireless/microchip/wilc1000/netdev.c +++ b/drivers/net/wireless/microchip/wilc1000/netdev.c @@ -176,23 +176,19 @@ static int wilc_wlan_get_firmware(struct net_device *dev) struct wilc_vif *vif = netdev_priv(dev); struct wilc *wilc = vif->wilc; int chip_id; - const struct firmware *wilc_firmware; - char *firmware; + const struct firmware *wilc_fw; chip_id = wilc_get_chipid(wilc, false); - if (chip_id < 0x1003a0) - firmware = FIRMWARE_1002; - else - firmware = FIRMWARE_1003; - - netdev_info(dev, "loading firmware %s\n", firmware); + netdev_info(dev, "ChipID [%x] loading firmware [%s]\n", chip_id, + FIRMWARE_WILC1000); - if (request_firmware(&wilc_firmware, firmware, wilc->dev) != 0) { - netdev_err(dev, "%s - firmware not available\n", firmware); + if (request_firmware(&wilc_fw, FIRMWARE_WILC1000, wilc->dev) != 0) { + netdev_err(dev, "%s - firmware not available\n", + FIRMWARE_WILC1000); return -EINVAL; } - wilc->firmware = wilc_firmware; + wilc->firmware = wilc_fw; return 0; } From patchwork Fri Jul 10 05:18:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 11655665 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 50E1613BD for ; Fri, 10 Jul 2020 05:22:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 32F1720720 for ; Fri, 10 Jul 2020 05:22:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="ywN2jOsF"; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="FKgFnEa7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726925AbgGJFWd (ORCPT ); Fri, 10 Jul 2020 01:22:33 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:28889 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726004AbgGJFTI (ORCPT ); Fri, 10 Jul 2020 01:19:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1594358348; x=1625894348; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=l2+0rXca19dr7NRH/LsNBoT1ezEmVNY2DW9sIrPMSXM=; b=ywN2jOsF4hWR2IDrDPr28/uybRQrJu7RAYJJsn0LAWtXlo53AUC7KPdU rq9+4URw6s9FOSF/m7hCZQWfu2QGsTv1zM7tsyIc81NHj07aTpLpKP8hx qiw5pNFzLiNaXSqxeaF3qNyi1mEEqpMW0Z4J3NWyUtqm+ZS9VeLETqoVk ZlEQNxBmr0T6tFKB7AbddAOrUZYhpayBUezsOLfkkfOK+fK6FvrWvYsdI OM21zJQw1VsIuxkRj+Yv5I7JQFeDUk2PMIb2mKU/vdkWbsLGIm0t/T42C Xvgh+HI4e0kONs+SEHcHueE/MfyBt7nVFNmwoTx26v4dHcrObxcA2Jlzb w==; IronPort-SDR: R17nd6fdhLH10F03Z/uKXuM+9aIFJUdaltudCX2JJ0Orh3NPjwXyGD174SRvkJ37LA4/sfVcZV tGxqoltKH5N8b1dk+0Obl3mtgJP1hchQAu6sq7GYt6+Sc6C2FY5cS8GJNFPi1YhnI3j/vMErZ5 Zx95jUGnCGqgPuSPibp76bU8AvXSQ1rbyBu9KWqAJBRaN3QriDxPEd31kHa9p496v4Mywd5Etz ioBmtD1PO61I0CZjX3qqAzKF4bNg5nOGlJteG8iCCEhc5BikWoP2J2YBi3zvMfQ3skkK1tQ/hB +Og= X-IronPort-AV: E=Sophos;i="5.75,334,1589266800"; d="scan'208";a="82539360" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 09 Jul 2020 22:18:35 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 9 Jul 2020 22:18:05 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3 via Frontend Transport; Thu, 9 Jul 2020 22:18:07 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NWDjH1MCkL5wHggqJCnLyG02S0pdM7LLwKwjQcB9w7lwbQiiKUUkGVgCXk49dy1freg4L1L/eKhXWfoiEfgKX4E2K3Bff65GRXIHUfwEfACk4KBcJsryseAaLJ0WWGLUB3EX/6rPBrLrV67UsFj4OCZ4p8kZE/AShsoVFMPaxvob1sbY8LttOo93E1/vpO/Ne2PQSBZZbuqN6dbhbEosx7OYdyXIt96sthd14W+IMZCk7t9T2u4DeNXvfhP+jvp92agC3HOOyNoQCzu54tkZWcaI15rX/yz5TwcNDZKS3kux+5d+6R7DYG2NJrhhvAPjQTBRatJ5xTr0z77a6oTV3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Yzo3O8vWrPLBamQohZL/ZRDaLKE+rJfuDkStDSX4eH8=; b=GtoYtvyMl7DLpPP2QGO89KshkTCjeSKrT2IZSDrXQ50zslB1hp3s5lb/JNveHv2NFa35+UWX4i6Cp8kQXiXjeYaWeFAI/26TtG+tcgU3L5eWw3tW4WIpnrRaJ2YwvECOaKgkQfGoX6VwxjdlzcaIm4ASC2bs7SUkCwYGHSHvol8B8VhuW8DA+1JSnPMr97TM++XZ5pfOLs8tGP96GlBTdnyKgn0W4eI46d0nTlEtHdEntSGtKy9UxOk6aACWnUbydiEm/oD32yvjFsED32L0KVhmsAVrF6x+1mxfnU9vn8pu2c1xKqgEz8LO1axnD2UVstbjcD1SD8/7MYGTr4SpEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Yzo3O8vWrPLBamQohZL/ZRDaLKE+rJfuDkStDSX4eH8=; b=FKgFnEa724VdnnnEQ2+ahK/1axCQ0vopDj00apZft0/Tt9TuYrIk6Y5E3VJl7NurefWcrZ4hIILdcyLk3WQl3MYfqOylnVgjiY3vyaeM0g/51fWKJpuRrM4ByXz4oQ43xChI3q4xBKxPkoD3J3pD5D/M4OPa/iW4h/y62VMxBRc= Received: from MN2PR11MB4030.namprd11.prod.outlook.com (2603:10b6:208:156::32) by MN2PR11MB4128.namprd11.prod.outlook.com (2603:10b6:208:139::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Fri, 10 Jul 2020 05:18:31 +0000 Received: from MN2PR11MB4030.namprd11.prod.outlook.com ([fe80::3874:6ace:6aec:deed]) by MN2PR11MB4030.namprd11.prod.outlook.com ([fe80::3874:6ace:6aec:deed%7]) with mapi id 15.20.3174.022; Fri, 10 Jul 2020 05:18:31 +0000 From: To: CC: , , , Subject: [PATCH wireless-drivers-next 5/5] wilc1000: use API version number info along with firmware filename Thread-Topic: [PATCH wireless-drivers-next 5/5] wilc1000: use API version number info along with firmware filename Thread-Index: AQHWVnmNy48lGSuBV0O6YXhxpnWyow== Date: Fri, 10 Jul 2020 05:18:31 +0000 Message-ID: <20200710051826.3267-6-ajay.kathat@microchip.com> References: <20200710051826.3267-1-ajay.kathat@microchip.com> In-Reply-To: <20200710051826.3267-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.17.1 authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; x-originating-ip: [49.207.205.82] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 53fac475-9abc-4fa1-c880-08d82490afeb x-ms-traffictypediagnostic: MN2PR11MB4128: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-bypassexternaltag: True x-ms-oob-tlc-oobclassifiers: OLM:230; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3Yu+ZEF51S8CYJlOwcRfa6IROnGJYOcEIVWHF9lRThVAj6qBGNSmyoXFp+WseGhiat+V7puwn2u6cXmgnNivN3s+YhDgxM48SaIOTj5IYG2gppMMMBZEUNdJi3TnygiaRt937SkQt4Jf1vAQ64kQAJ29kq9I9yIbin5hk1ysP8jneDS9Mu4UoLKZy75p8JAxmvWS6fXU+CRr7VkDqB/STltQ37xgEHSi3kxbJxF5W0DHII4zh3o40sHIwb6VayupZuUEAf3L0EZdjX9j2t3GiEe1YhJopu7flUTvZGj18YhgbAF4yFFByhHdGGqVMYy9 x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR11MB4030.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(39860400002)(346002)(366004)(376002)(396003)(2616005)(36756003)(186003)(6512007)(26005)(66446008)(66476007)(83380400001)(66556008)(8936002)(71200400001)(64756008)(8676002)(6486002)(2906002)(4326008)(478600001)(107886003)(86362001)(316002)(5660300002)(66946007)(54906003)(1076003)(76116006)(91956017)(6506007)(6916009)(55236004);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: g7y/fUSHeww3hgDGN0SSus7zK/x9x492MtdOu6HIx9aBrvj4sq1FZ8UZ/J+FXy7B+kYvXDoDoIbysDX0XJxmueWtxvNWun3sbxUZ4UI9nnCfcdJvvQDGmdyrHZGpbMBfdcfyx9rwUqpHUqYrycMx+LA/O9ofHY+4oOhvx5SxW3Ssiwq3D68Sq0VmdksoypmOp+sfcqtFgaPk96xTjnwcoDSdtYWmiNvPypgeP1COmPH0gaiMzPu0C04sg+umqe+KMZQwJMdvhNOJ8ELw1Uj1U8frqnStFAvE5F60uLUFlY0sDx3b9UOjbM0EOHiBnt4M9toZXPF6zzi3B9dE+70ZgvI8uiqbT/ZASsWsHRniFn1ZICp1O2IsP3brZPLqXYdMEFj1dMhLMnXrmOf62YBLfoQ3ZggcgCQNNIIVkQYsBG0S0tGadNSXvLX84qWDGJDdQNeVh4xfNKH45YuFBTkHKWBbNxD8gOIpODtVa3WWvMhcZ5QZlsXYFewMhTF7fySI MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR11MB4030.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53fac475-9abc-4fa1-c880-08d82490afeb X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jul 2020 05:18:31.7451 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 2UKQpnR0j1ZMAkidodCwBS7Uh9mO/QfN2QHLplejsTlNSBdF1UeU6xMZOANABd4QTp0KeweaSbaEScTw5nq0XYrJBXLmrlU6aLQ09MF3uU8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4128 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Added version number info along with firmware name so driver can pick the correct revision of FW file. Moved FW filename macro as part of driver code & added MODULE_FIRMWARE to specify FW needed by module. Signed-off-by: Ajay Singh --- .../net/wireless/microchip/wilc1000/Makefile | 2 -- .../net/wireless/microchip/wilc1000/netdev.c | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/Makefile b/drivers/net/wireless/microchip/wilc1000/Makefile index 7d1ed5f40cbb..c3c9e34c1eaa 100644 --- a/drivers/net/wireless/microchip/wilc1000/Makefile +++ b/drivers/net/wireless/microchip/wilc1000/Makefile @@ -1,8 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_WILC1000) += wilc1000.o -ccflags-y += -DFIRMWARE_WILC1000=\"atmel/wilc1000_wifi_firmware.bin\" - wilc1000-objs := cfg80211.o netdev.o mon.o \ hif.o wlan_cfg.o wlan.o diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c index 1005526ae896..198354670fe1 100644 --- a/drivers/net/wireless/microchip/wilc1000/netdev.c +++ b/drivers/net/wireless/microchip/wilc1000/netdev.c @@ -15,6 +15,13 @@ #define WILC_MULTICAST_TABLE_SIZE 8 +/* latest API version supported */ +#define WILC1000_API_VER 1 + +#define WILC1000_FW_PREFIX "atmel/wilc1000_wifi_firmware-" +#define __WILC1000_FW(api) WILC1000_FW_PREFIX #api ".bin" +#define WILC1000_FW(api) __WILC1000_FW(api) + static irqreturn_t isr_uh_routine(int irq, void *user_data) { struct net_device *dev = user_data; @@ -177,15 +184,18 @@ static int wilc_wlan_get_firmware(struct net_device *dev) struct wilc *wilc = vif->wilc; int chip_id; const struct firmware *wilc_fw; + int ret; chip_id = wilc_get_chipid(wilc, false); netdev_info(dev, "ChipID [%x] loading firmware [%s]\n", chip_id, - FIRMWARE_WILC1000); + WILC1000_FW(WILC1000_API_VER)); - if (request_firmware(&wilc_fw, FIRMWARE_WILC1000, wilc->dev) != 0) { + ret = request_firmware(&wilc_fw, WILC1000_FW(WILC1000_API_VER), + wilc->dev); + if (ret != 0) { netdev_err(dev, "%s - firmware not available\n", - FIRMWARE_WILC1000); + WILC1000_FW(WILC1000_API_VER)); return -EINVAL; } wilc->firmware = wilc_fw; @@ -925,3 +935,4 @@ struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl, const char *name, } MODULE_LICENSE("GPL"); +MODULE_FIRMWARE(WILC1000_FW(WILC1000_API_VER));