From patchwork Tue Nov 5 09:51:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 11227421 X-Patchwork-Delegate: johannes@sipsolutions.net 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 220FD1390 for ; Tue, 5 Nov 2019 09:51:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBBA421929 for ; Tue, 5 Nov 2019 09:51:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="WSvwGc81" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730715AbfKEJv3 (ORCPT ); Tue, 5 Nov 2019 04:51:29 -0500 Received: from esa2.microchip.iphmx.com ([68.232.149.84]:28018 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730573AbfKEJv3 (ORCPT ); Tue, 5 Nov 2019 04:51:29 -0500 Received-SPF: Pass (esa2.microchip.iphmx.com: domain of Ajay.Kathat@microchip.com designates 198.175.253.82 as permitted sender) identity=mailfrom; client-ip=198.175.253.82; receiver=esa2.microchip.iphmx.com; envelope-from="Ajay.Kathat@microchip.com"; x-sender="Ajay.Kathat@microchip.com"; x-conformance=spf_only; x-record-type="v=spf1"; x-record-text="v=spf1 mx a:ushub1.microchip.com a:smtpout.microchip.com a:mx1.microchip.iphmx.com a:mx2.microchip.iphmx.com include:servers.mcsv.net include:mktomail.com include:spf.protection.outlook.com ~all" Received-SPF: None (esa2.microchip.iphmx.com: no sender authenticity information available from domain of postmaster@email.microchip.com) identity=helo; client-ip=198.175.253.82; receiver=esa2.microchip.iphmx.com; envelope-from="Ajay.Kathat@microchip.com"; x-sender="postmaster@email.microchip.com"; x-conformance=spf_only Authentication-Results: esa2.microchip.iphmx.com; spf=Pass smtp.mailfrom=Ajay.Kathat@microchip.com; spf=None smtp.helo=postmaster@email.microchip.com; dkim=pass (signature verified) header.i=@microchiptechnology.onmicrosoft.com; dmarc=pass (p=none dis=none) d=microchip.com IronPort-SDR: WzMyZalH4CBeXPyVresdxG8bx9JSe59/pLbSSbSO9xfGKSH8Ow/K3EBRfMsAYU+WvpPa7+du+C Wv6F4vIiIJsVmeZlE4NTCsUbWTGHI9vHd8tgyVq61migdwgieSNzLsoWWFCPwcPNyNhtMU1dhB J1k0lqzPfGoumv0cZ4/sussMZDjJFlZwTe+uPV28wTRhd9NGlvXgjtGQkiy9CsQTsn6tSSUDJC +hXAPiCLmdQfFrb07/2aEg3J7pZGw5QDCJeRpiW+eU/9nOp0fMODnVgFL6X3MBuzwz4lu9efE8 VO8= X-IronPort-AV: E=Sophos;i="5.68,270,1569308400"; d="scan'208";a="55347240" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 05 Nov 2019 02:51:28 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 5 Nov 2019 02:51:26 -0700 Received: from NAM05-DM3-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 5 Nov 2019 02:51:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j3lbJVZeL7Ki+oA5VnzDlTt5Jxb/lj8F2AjX5T1Xbhk11nNKkfpZDXan9fW6s6dXTIRzKFuJK0DTi6+xNCMHuLOUpgOBOJThqAhIYrt4kgEgY38gvgEULhX46EScLmZ2zTpqEKPDXwdxZygIDGbraHbLuqvXe9XkorZjYhRgWSbsQftkyE8GrN+Wv2E+YVPBaQl+Y7T/nV/h7WWQaOB1mqKnh+X8yAGSvoSMtD4qSrsFKOuBKQdy0RJLWAfxbFwsUsqD0cSsL3q8lwmF4pElFsHA/e7QJjmTxwSWmsN1hR6Fy+5x8iz5rvEmKYpuyRyxi5pgPJXVSoe2TZKyEiyBzA== 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=nr1QZ5VLqprKCCjAYCo1DIiq/yoqDPG/msRjnY6+6gg=; b=SFAvIbMnqzp3VjsnLcW8ZXQodEI5SgZCXKglgXEe+phFvEHtmRY2qwPvXziYiMQ8n5Hjhk1Q8uhFwc3r7P68dq2zHEtASVmM6nQLVUBWG4M8gWvUf5AoKikag8F443Pupl5fsuxYF/zOZFL+KLeX/VG9mWOph4BeIopFzblUmk5WRw7dV5DLVxy1MrVj97TpB2XcvtKCs7OAa2um4ZzIruN5F0Sfv7h7LWPidF8QQgIf4M3vzHW7juZU+0zI7OswI7sSfsn65tWWLdYGg3enfoRqpzSQqPK4R7Vtw5ZY9xKN96PgbRz8M1HAO6MQbk9MLeoC6s/q6Py0m3mslXY89Q== 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=nr1QZ5VLqprKCCjAYCo1DIiq/yoqDPG/msRjnY6+6gg=; b=WSvwGc81d89q1D1v4oxeGgvgEJznjbAM5FsgfxpFxeffTUcNJYTyMJjKtbBtoNAJL0p78hQW2zJwPNqi4Gf/YLqby+GApkBN/DqAQjlbQgElGP9AMucflSoV0wHDKlyqKcw/ebrKoEnFYcdtU3kUvzEzrSSGqY5+y20VryOWKB0= Received: from BN6PR11MB3985.namprd11.prod.outlook.com (10.255.129.78) by BN6PR11MB1972.namprd11.prod.outlook.com (10.175.100.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2408.24; Tue, 5 Nov 2019 09:51:22 +0000 Received: from BN6PR11MB3985.namprd11.prod.outlook.com ([fe80::5994:7522:979f:5e29]) by BN6PR11MB3985.namprd11.prod.outlook.com ([fe80::5994:7522:979f:5e29%7]) with mapi id 15.20.2408.024; Tue, 5 Nov 2019 09:51:22 +0000 From: To: CC: , , , , Subject: [PATCH 1/6] staging: wilc1000: avoid 'bool' datatype in struct sent to firmware Thread-Topic: [PATCH 1/6] staging: wilc1000: avoid 'bool' datatype in struct sent to firmware Thread-Index: AQHVk76UV3bXW7Fx8UqiayEtu48wlA== Date: Tue, 5 Nov 2019 09:51:22 +0000 Message-ID: <20191105095058.24223-2-ajay.kathat@microchip.com> References: <20191105095058.24223-1-ajay.kathat@microchip.com> In-Reply-To: <20191105095058.24223-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0127.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::21) To BN6PR11MB3985.namprd11.prod.outlook.com (2603:10b6:405:7b::14) x-mailer: git-send-email 2.22.0 x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [121.244.27.38] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7ed86c14-b9c7-4920-37f2-08d761d5b6ec x-ms-traffictypediagnostic: BN6PR11MB1972: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3968; x-forefront-prvs: 0212BDE3BE x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(396003)(376002)(136003)(346002)(39860400002)(199004)(189003)(6486002)(6436002)(2616005)(36756003)(71190400001)(486006)(186003)(86362001)(76176011)(386003)(14454004)(5640700003)(52116002)(2501003)(6512007)(64756008)(99286004)(6916009)(66446008)(66476007)(66946007)(66556008)(71200400001)(2351001)(26005)(316002)(8936002)(8676002)(50226002)(81166006)(81156014)(102836004)(6506007)(4744005)(5660300002)(11346002)(1076003)(476003)(107886003)(54906003)(446003)(478600001)(25786009)(2906002)(7736002)(305945005)(4326008)(6116002)(3846002)(256004)(14444005)(66066001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1972;H:BN6PR11MB3985.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: U3PgRQSyURsXmV5bTc41vX325cz9xfluVpbNUBDwtZNPoT0hlJCsC2tPglMblNfeLSCER2dHmxvV/Nbcctaer0PzQtHqVhnC+DpHJRhGJPyXWdAgzSZl+OW6LBvWR5H3lVWd50jSGhpQgwYUoyIrh943BmPZoHZ6poNDA3ak37LsTiOiBXvOgJD5RIuJtDu5em83VZix2MwmdHcEq5A4SnGkfWnEoO2L+osw/RsieFYV9d4aBFlIImjWmPUqZ2YNKPB4S4f9s2+xPoTr4Ri3czCqKDMN27ihzrS0pM6oyNhyj9AcANBLX5bctmn34R3AvDArDdnaGEFQBvkHatD1OQW+wJGrhq5gfhqBqDQ9r/Z+g2RJ4wbfsTIiK8FqsXbG2PkFEJWMH0njzpyqveytNy1/4HMY0cWaAgyQJN8N9eGzlbJVIjKepoq67JfpYrJi MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 7ed86c14-b9c7-4920-37f2-08d761d5b6ec X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2019 09:51:22.5664 (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: nx0i9b9bgNRqdnawj0IHHBUvbN6saFdjbhG+x+o1f0neYnC+iOmWDc9O3ZbGUPjhH00Zd0Bls0hUeYXdZmRfEurDlJYGY0A/2DWdi+pGURY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1972 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Use 'u8' instead of 'bool' datatype for struct element sent to firmware because storage of bool datatype is not guaranteed. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/wilc_hif.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_hif.c b/drivers/staging/wilc1000/wilc_hif.c index e0a95c5cc0d5..59eb7600619b 100644 --- a/drivers/staging/wilc1000/wilc_hif.c +++ b/drivers/staging/wilc1000/wilc_hif.c @@ -32,7 +32,7 @@ struct wilc_op_mode { }; struct wilc_reg_frame { - bool reg; + u8 reg; u8 reg_id; __le16 frame_type; } __packed; @@ -1784,7 +1784,9 @@ void wilc_frame_register(struct wilc_vif *vif, u16 frame_type, bool reg) wid.val = (u8 *)®_frame; memset(®_frame, 0x0, sizeof(reg_frame)); - reg_frame.reg = reg; + + if (reg) + reg_frame.reg = 1; switch (frame_type) { case IEEE80211_STYPE_ACTION: From patchwork Tue Nov 5 09:51: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: 11227423 X-Patchwork-Delegate: johannes@sipsolutions.net 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 DC4321747 for ; Tue, 5 Nov 2019 09:51:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A827F21929 for ; Tue, 5 Nov 2019 09:51:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="CmGtOGEZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388209AbfKEJva (ORCPT ); Tue, 5 Nov 2019 04:51:30 -0500 Received: from esa2.microchip.iphmx.com ([68.232.149.84]:28018 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730692AbfKEJv3 (ORCPT ); Tue, 5 Nov 2019 04:51:29 -0500 Received-SPF: Pass (esa2.microchip.iphmx.com: domain of Ajay.Kathat@microchip.com designates 198.175.253.82 as permitted sender) identity=mailfrom; client-ip=198.175.253.82; receiver=esa2.microchip.iphmx.com; envelope-from="Ajay.Kathat@microchip.com"; x-sender="Ajay.Kathat@microchip.com"; x-conformance=spf_only; x-record-type="v=spf1"; x-record-text="v=spf1 mx a:ushub1.microchip.com a:smtpout.microchip.com a:mx1.microchip.iphmx.com a:mx2.microchip.iphmx.com include:servers.mcsv.net include:mktomail.com include:spf.protection.outlook.com ~all" Received-SPF: None (esa2.microchip.iphmx.com: no sender authenticity information available from domain of postmaster@email.microchip.com) identity=helo; client-ip=198.175.253.82; receiver=esa2.microchip.iphmx.com; envelope-from="Ajay.Kathat@microchip.com"; x-sender="postmaster@email.microchip.com"; x-conformance=spf_only Authentication-Results: esa2.microchip.iphmx.com; spf=Pass smtp.mailfrom=Ajay.Kathat@microchip.com; spf=None smtp.helo=postmaster@email.microchip.com; dkim=pass (signature verified) header.i=@microchiptechnology.onmicrosoft.com; dmarc=pass (p=none dis=none) d=microchip.com IronPort-SDR: gPfNh8ZdzXOFWXV3YbmQ2P+UGDJYrpQQG9UO8K+NpvhSfyQpu68oZ4QVoz+IKB88b0TUVeAqe5 BWW+DTI0EWBdk+PbQ/Cr2lA6VZwNOAZKBOioiJ2CsyBWCg2kTK4UAL4Z42i+u+FUWp4SDJh6cf oZCjUiL0ycvzZrRluCWcRyWbOOrfNUFBToSKOzFwx/cI54EF9aGTRt1cEUccADtvU02Xptq+Me sq0NZc0HXAK0jQ4uBDmQnIsNQ6vrprqgvlOb4FQ/L3nvhY3ND0AT1EAyJtNWj1ROTUEHkrFYl2 qZ8= X-IronPort-AV: E=Sophos;i="5.68,270,1569308400"; d="scan'208";a="55347241" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 05 Nov 2019 02:51:28 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 5 Nov 2019 02:51:26 -0700 Received: from NAM05-DM3-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 5 Nov 2019 02:51:27 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EyQOWQRvk81ignzAtxA1z9tW1+FmG7rABEtVkhnNPHSE3smHU6xcMEqdkdpDGegbs27nUdHe0D400nJm3K0bM5ei7gA5A34GjT2L+Gya9FqQpJqPXYY4tL/pqbt91p5lCmEr8bVCY1UMA0RMBDFIQ4lIEZrBOfHjEhJtAk271NRyUXTV+peO7dudHb6xMGYl+/IB3eBDFXkm6FxXIJOmUZhh5DC2G6z3XoNYQHbWTcsWaekLriMPmEtwnUfaBWxgr9Ed0G10bshUbsE1mUHKBNcUj6Zbz14TbR/bzWyidLuPV5e2M2WWXNgfbthKhQfMhLX9LhAVHwJ9TZcbiUclUw== 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=9yhP/NQ/8npXThIcJJm91MPp1VKEfEOSw64Somi19Yc=; b=dZ7TbCHUbyfHCMm3Nl+BP0zZh/qJVejiOhRHb4k372jZWSj3NLhYxE5R3nrAacZvMgErs5jxx4UIkENDSgb8g1VUCmEkRP7S6xhKpvjBVJIkUmtWxB/F2teua5SmQZnt/+tpcsRQh1kRiKUn67ll8aSwGnItTIjrzICBFk5JYrhgYVqke1HpbXKw1psCalmuTBVwujLNK2e9r0Lr8udabhBwMKeH7x+DpHyvTU746GOoYR5LkudjaMMpodhYlEJKYWv214MvRe+p5zJVAvGT8v3qmY0zo7HkAdRdCZyFBsYdxijoYUdFCsEzpHTsBhpcOIim/K8h9Bh1Fqctj3QkFw== 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=9yhP/NQ/8npXThIcJJm91MPp1VKEfEOSw64Somi19Yc=; b=CmGtOGEZqXoFkwVasCx24lNDWLSVOzIX8dHu52PnaeRWjwjWsRVF8zOUISsMyG5PBxejCVfPYML6ZDmkWP17LXJF0Kru8c+X2NyhRR9D9NJKLzXYDaQ/Q9b4+CHsPl1wgY9IV03Dt5y2ZTGDcDOmV/99DsFRNhiIN/mUJyyC0A0= Received: from BN6PR11MB3985.namprd11.prod.outlook.com (10.255.129.78) by BN6PR11MB1972.namprd11.prod.outlook.com (10.175.100.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2408.24; Tue, 5 Nov 2019 09:51:25 +0000 Received: from BN6PR11MB3985.namprd11.prod.outlook.com ([fe80::5994:7522:979f:5e29]) by BN6PR11MB3985.namprd11.prod.outlook.com ([fe80::5994:7522:979f:5e29%7]) with mapi id 15.20.2408.024; Tue, 5 Nov 2019 09:51:25 +0000 From: To: CC: , , , , Subject: [PATCH 2/6] staging: wilc1000: remove 'wilc_' prefix from filenames Thread-Topic: [PATCH 2/6] staging: wilc1000: remove 'wilc_' prefix from filenames Thread-Index: AQHVk76WK1y3uclfH0CgV2CVly4LJg== Date: Tue, 5 Nov 2019 09:51:25 +0000 Message-ID: <20191105095058.24223-3-ajay.kathat@microchip.com> References: <20191105095058.24223-1-ajay.kathat@microchip.com> In-Reply-To: <20191105095058.24223-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0127.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::21) To BN6PR11MB3985.namprd11.prod.outlook.com (2603:10b6:405:7b::14) x-mailer: git-send-email 2.22.0 x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [121.244.27.38] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a67ee5b0-98cc-4bfc-d225-08d761d5b8a0 x-ms-traffictypediagnostic: BN6PR11MB1972: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; x-forefront-prvs: 0212BDE3BE x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(396003)(376002)(136003)(346002)(39860400002)(199004)(189003)(6486002)(6436002)(2616005)(36756003)(71190400001)(486006)(186003)(86362001)(76176011)(386003)(14454004)(5640700003)(52116002)(2501003)(6512007)(64756008)(99286004)(6916009)(66446008)(66476007)(66946007)(66556008)(71200400001)(2351001)(26005)(316002)(8936002)(8676002)(50226002)(81166006)(81156014)(102836004)(6506007)(5660300002)(11346002)(1076003)(476003)(107886003)(54906003)(446003)(478600001)(25786009)(2906002)(7736002)(305945005)(4326008)(6116002)(3846002)(256004)(66066001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1972;H:BN6PR11MB3985.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: D9N2C6LZ2OcxFeyACQ7ag0chJfXNAy1HxzZ5Llp92NAWpGk4yHfacN0YfWLU2OlsHOoapdVN5rErBZWoxj9K9kcxW2nkf7MwjbhV5Hpr9/gVDvicVSUohaIyfJrIpu/NIfpUvqxDWkViPLjqQxY1Z8a1Vbe5KWxhQnofvIz9C3IMCPuRBcvxwBJeZQbz5HEkxxqv9ATw5BhJ37Expke+j6bz/JIgsgv0wb3GUxvIn/TiRz3yL73pvkmldFNQxWJ3s0JKEANyRxMjlpaxuHIhet5Sat3WRelRj2TGaBo+En/3ibOJ6afwXXGeDYq9UXYMN03kGT+PjoE7x3sXaiLx3i7MJwcANn/9QfCrvLDmnYC4bn1PEKY6UCR3MwFF7vGTlKryb7ob2WiHlocovYc7MwnmnjKzjGol8Wmqz8qXw+p6ozDuZxJhd3hhrfoqjGXA MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: a67ee5b0-98cc-4bfc-d225-08d761d5b8a0 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2019 09:51:25.3937 (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: ancbhmeaXYIFLDvQzrrY8qiThEH1x6KoKT3lY2P00T4MJ8VeqGfZCT9IhLcidZimUiQ0f5i69kIRFBLaraZ5GarQmCHbWZnRIVUFLwKp2Oc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1972 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Remove 'wilc_' prefix from filenames, the driver is already present inside the 'wilc1000' directory so no need to add 'wilc_' in filenames. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/Makefile | 8 ++++---- .../wilc1000/{wilc_wfi_cfgoperations.c => cfg80211.c} | 2 +- .../wilc1000/{wilc_wfi_cfgoperations.h => cfg80211.h} | 2 +- drivers/staging/wilc1000/{wilc_hif.c => hif.c} | 2 +- drivers/staging/wilc1000/{wilc_hif.h => hif.h} | 2 +- drivers/staging/wilc1000/{wilc_mon.c => mon.c} | 2 +- drivers/staging/wilc1000/{wilc_netdev.c => netdev.c} | 4 ++-- .../staging/wilc1000/{wilc_wfi_netdevice.h => netdev.h} | 6 +++--- drivers/staging/wilc1000/{wilc_sdio.c => sdio.c} | 4 ++-- drivers/staging/wilc1000/{wilc_spi.c => spi.c} | 4 ++-- drivers/staging/wilc1000/{wilc_wlan.c => wlan.c} | 4 ++-- drivers/staging/wilc1000/{wilc_wlan.h => wlan.h} | 0 drivers/staging/wilc1000/{wilc_wlan_cfg.c => wlan_cfg.c} | 8 ++++---- drivers/staging/wilc1000/{wilc_wlan_cfg.h => wlan_cfg.h} | 0 drivers/staging/wilc1000/{wilc_wlan_if.h => wlan_if.h} | 0 15 files changed, 24 insertions(+), 24 deletions(-) rename drivers/staging/wilc1000/{wilc_wfi_cfgoperations.c => cfg80211.c} (99%) rename drivers/staging/wilc1000/{wilc_wfi_cfgoperations.h => cfg80211.h} (97%) rename drivers/staging/wilc1000/{wilc_hif.c => hif.c} (99%) rename drivers/staging/wilc1000/{wilc_hif.h => hif.h} (99%) rename drivers/staging/wilc1000/{wilc_mon.c => mon.c} (99%) rename drivers/staging/wilc1000/{wilc_netdev.c => netdev.c} (99%) rename drivers/staging/wilc1000/{wilc_wfi_netdevice.h => netdev.h} (98%) rename drivers/staging/wilc1000/{wilc_sdio.c => sdio.c} (99%) rename drivers/staging/wilc1000/{wilc_spi.c => spi.c} (99%) rename drivers/staging/wilc1000/{wilc_wlan.c => wlan.c} (99%) rename drivers/staging/wilc1000/{wilc_wlan.h => wlan.h} (100%) rename drivers/staging/wilc1000/{wilc_wlan_cfg.c => wlan_cfg.c} (98%) rename drivers/staging/wilc1000/{wilc_wlan_cfg.h => wlan_cfg.h} (100%) rename drivers/staging/wilc1000/{wilc_wlan_if.h => wlan_if.h} (100%) diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile index a5a8e806b98e..a3305a0a888a 100644 --- a/drivers/staging/wilc1000/Makefile +++ b/drivers/staging/wilc1000/Makefile @@ -4,11 +4,11 @@ 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 wilc_netdev.o wilc_mon.o \ - wilc_hif.o wilc_wlan_cfg.o wilc_wlan.o +wilc1000-objs := cfg80211.o netdev.o mon.o \ + hif.o wlan_cfg.o wlan.o obj-$(CONFIG_WILC1000_SDIO) += wilc1000-sdio.o -wilc1000-sdio-objs += wilc_sdio.o +wilc1000-sdio-objs += sdio.o obj-$(CONFIG_WILC1000_SPI) += wilc1000-spi.o -wilc1000-spi-objs += wilc_spi.o +wilc1000-spi-objs += spi.o diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/cfg80211.c similarity index 99% rename from drivers/staging/wilc1000/wilc_wfi_cfgoperations.c rename to drivers/staging/wilc1000/cfg80211.c index 66328ac85adc..4863e516ff13 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/cfg80211.c @@ -4,7 +4,7 @@ * All rights reserved. */ -#include "wilc_wfi_cfgoperations.h" +#include "cfg80211.h" #define FRAME_TYPE_ID 0 #define ACTION_CAT_ID 24 diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h b/drivers/staging/wilc1000/cfg80211.h similarity index 97% rename from drivers/staging/wilc1000/wilc_wfi_cfgoperations.h rename to drivers/staging/wilc1000/cfg80211.h index 7206b6162a8c..05c910baf095 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h +++ b/drivers/staging/wilc1000/cfg80211.h @@ -6,7 +6,7 @@ #ifndef NM_WFI_CFGOPERATIONS #define NM_WFI_CFGOPERATIONS -#include "wilc_wfi_netdevice.h" +#include "netdev.h" struct wiphy *wilc_cfg_alloc(void); int wilc_cfg80211_init(struct wilc **wilc, struct device *dev, int io_type, diff --git a/drivers/staging/wilc1000/wilc_hif.c b/drivers/staging/wilc1000/hif.c similarity index 99% rename from drivers/staging/wilc1000/wilc_hif.c rename to drivers/staging/wilc1000/hif.c index 59eb7600619b..25f035c02b10 100644 --- a/drivers/staging/wilc1000/wilc_hif.c +++ b/drivers/staging/wilc1000/hif.c @@ -4,7 +4,7 @@ * All rights reserved. */ -#include "wilc_wfi_netdevice.h" +#include "netdev.h" #define WILC_HIF_SCAN_TIMEOUT_MS 5000 #define WILC_HIF_CONNECT_TIMEOUT_MS 9500 diff --git a/drivers/staging/wilc1000/wilc_hif.h b/drivers/staging/wilc1000/hif.h similarity index 99% rename from drivers/staging/wilc1000/wilc_hif.h rename to drivers/staging/wilc1000/hif.h index ac5fe57f872b..2defe58ab194 100644 --- a/drivers/staging/wilc1000/wilc_hif.h +++ b/drivers/staging/wilc1000/hif.h @@ -7,7 +7,7 @@ #ifndef HOST_INT_H #define HOST_INT_H #include -#include "wilc_wlan_if.h" +#include "wlan_if.h" enum { WILC_IDLE_MODE = 0x0, diff --git a/drivers/staging/wilc1000/wilc_mon.c b/drivers/staging/wilc1000/mon.c similarity index 99% rename from drivers/staging/wilc1000/wilc_mon.c rename to drivers/staging/wilc1000/mon.c index d6f14f69ad64..853fe3056a53 100644 --- a/drivers/staging/wilc1000/wilc_mon.c +++ b/drivers/staging/wilc1000/mon.c @@ -4,7 +4,7 @@ * All rights reserved. */ -#include "wilc_wfi_cfgoperations.h" +#include "cfg80211.h" struct wilc_wfi_radiotap_hdr { struct ieee80211_radiotap_header hdr; diff --git a/drivers/staging/wilc1000/wilc_netdev.c b/drivers/staging/wilc1000/netdev.c similarity index 99% rename from drivers/staging/wilc1000/wilc_netdev.c rename to drivers/staging/wilc1000/netdev.c index 2bc7e5427fa8..d2c0b0f7cf63 100644 --- a/drivers/staging/wilc1000/wilc_netdev.c +++ b/drivers/staging/wilc1000/netdev.c @@ -10,8 +10,8 @@ #include #include -#include "wilc_wfi_cfgoperations.h" -#include "wilc_wlan_cfg.h" +#include "cfg80211.h" +#include "wlan_cfg.h" #define WILC_MULTICAST_TABLE_SIZE 8 diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/netdev.h similarity index 98% rename from drivers/staging/wilc1000/wilc_wfi_netdevice.h rename to drivers/staging/wilc1000/netdev.h index d94a4808bdf9..8bc62ce4f2f7 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/netdev.h @@ -14,9 +14,9 @@ #include #include -#include "wilc_hif.h" -#include "wilc_wlan.h" -#include "wilc_wlan_cfg.h" +#include "hif.h" +#include "wlan.h" +#include "wlan_cfg.h" #define FLOW_CONTROL_LOWER_THRESHOLD 128 #define FLOW_CONTROL_UPPER_THRESHOLD 256 diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/sdio.c similarity index 99% rename from drivers/staging/wilc1000/wilc_sdio.c rename to drivers/staging/wilc1000/sdio.c index c787c5da8f2b..319e039380b0 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/sdio.c @@ -8,8 +8,8 @@ #include #include -#include "wilc_wfi_netdevice.h" -#include "wilc_wfi_cfgoperations.h" +#include "netdev.h" +#include "cfg80211.h" #define SDIO_MODALIAS "wilc1000_sdio" diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/spi.c similarity index 99% rename from drivers/staging/wilc1000/wilc_spi.c rename to drivers/staging/wilc1000/spi.c index 166455a969bf..55f8757325f0 100644 --- a/drivers/staging/wilc1000/wilc_spi.c +++ b/drivers/staging/wilc1000/spi.c @@ -7,8 +7,8 @@ #include #include -#include "wilc_wfi_netdevice.h" -#include "wilc_wfi_cfgoperations.h" +#include "netdev.h" +#include "cfg80211.h" struct wilc_spi { int crc_off; diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wlan.c similarity index 99% rename from drivers/staging/wilc1000/wilc_wlan.c rename to drivers/staging/wilc1000/wlan.c index 771d8cb68dc1..d3de76126b78 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wlan.c @@ -6,8 +6,8 @@ #include #include -#include "wilc_wfi_cfgoperations.h" -#include "wilc_wlan_cfg.h" +#include "cfg80211.h" +#include "wlan_cfg.h" static inline bool is_wilc1000(u32 id) { diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wlan.h similarity index 100% rename from drivers/staging/wilc1000/wilc_wlan.h rename to drivers/staging/wilc1000/wlan.h diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wlan_cfg.c similarity index 98% rename from drivers/staging/wilc1000/wilc_wlan_cfg.c rename to drivers/staging/wilc1000/wlan_cfg.c index 3f53807cee0f..904f84077ff7 100644 --- a/drivers/staging/wilc1000/wilc_wlan_cfg.c +++ b/drivers/staging/wilc1000/wlan_cfg.c @@ -4,10 +4,10 @@ * All rights reserved. */ -#include "wilc_wlan_if.h" -#include "wilc_wlan.h" -#include "wilc_wlan_cfg.h" -#include "wilc_wfi_netdevice.h" +#include "wlan_if.h" +#include "wlan.h" +#include "wlan_cfg.h" +#include "netdev.h" enum cfg_cmd_type { CFG_BYTE_CMD = 0, diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.h b/drivers/staging/wilc1000/wlan_cfg.h similarity index 100% rename from drivers/staging/wilc1000/wilc_wlan_cfg.h rename to drivers/staging/wilc1000/wlan_cfg.h diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wlan_if.h similarity index 100% rename from drivers/staging/wilc1000/wilc_wlan_if.h rename to drivers/staging/wilc1000/wlan_if.h From patchwork Tue Nov 5 09:51:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 11227425 X-Patchwork-Delegate: johannes@sipsolutions.net 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 452411390 for ; Tue, 5 Nov 2019 09:51:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A473217F5 for ; Tue, 5 Nov 2019 09:51:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="GenCmDXZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730692AbfKEJvj (ORCPT ); Tue, 5 Nov 2019 04:51:39 -0500 Received: from esa2.microchip.iphmx.com ([68.232.149.84]:28039 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730583AbfKEJvj (ORCPT ); Tue, 5 Nov 2019 04:51:39 -0500 Received-SPF: Pass (esa2.microchip.iphmx.com: domain of Ajay.Kathat@microchip.com designates 198.175.253.82 as permitted sender) identity=mailfrom; client-ip=198.175.253.82; receiver=esa2.microchip.iphmx.com; envelope-from="Ajay.Kathat@microchip.com"; x-sender="Ajay.Kathat@microchip.com"; x-conformance=spf_only; x-record-type="v=spf1"; x-record-text="v=spf1 mx a:ushub1.microchip.com a:smtpout.microchip.com a:mx1.microchip.iphmx.com a:mx2.microchip.iphmx.com include:servers.mcsv.net include:mktomail.com include:spf.protection.outlook.com ~all" Received-SPF: None (esa2.microchip.iphmx.com: no sender authenticity information available from domain of postmaster@email.microchip.com) identity=helo; client-ip=198.175.253.82; receiver=esa2.microchip.iphmx.com; envelope-from="Ajay.Kathat@microchip.com"; x-sender="postmaster@email.microchip.com"; x-conformance=spf_only Authentication-Results: esa2.microchip.iphmx.com; spf=Pass smtp.mailfrom=Ajay.Kathat@microchip.com; spf=None smtp.helo=postmaster@email.microchip.com; dkim=pass (signature verified) header.i=@microchiptechnology.onmicrosoft.com; dmarc=pass (p=none dis=none) d=microchip.com IronPort-SDR: 7DVj/YiA6VTqEEYOiOlG3YtrQ0B3zaNMpnGtREsDCgHPo+vu33s8Et5wt2eqidCqs8pgMviKLg 0bcksLzMei4ima/lzxvHBXYGvHuOZsnFI0CIsQL+CsePDGVl6ywcTxbd08BuUZCR5jsZe2CekC 6tkCaEJpW/pVSMv875WMfQOSa3+zDbP4Nm88N0PzRJYtpWWptn6RCIpjlsDYqgQuvMrkWp6ScB cAFkUyN7h9XswDvjxxSzW42VojhoJ7HX8A7n4TwpSBaihIXyBSeaF+VpHxxaN4Rh1IhwgAMQu8 hsw= X-IronPort-AV: E=Sophos;i="5.68,270,1569308400"; d="scan'208";a="55347263" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 05 Nov 2019 02:51:37 -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.1713.5; Tue, 5 Nov 2019 02:51:28 -0700 Received: from NAM05-DM3-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_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 5 Nov 2019 02:51:30 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=korfY6WFAFFsQjWEs+Y9aEf0+0b+DMuMdaniYCDNmg01O8Zexp6RyLMQQ2sIGIouh7L4Vi3WfBiLnHLbYqCS62Er/MwFwiwQfengGapkVRt4FyyS+IvEnX339hqFHhDVLL0j/bemgvkUlDVxVra/lyTwmvuzwDXfP6phG+98Y1YwwCSE6izyXNdfu2dOvk5t9Z5iAk1da3swsCorbDpo/sDvVxGJ2sc2rIvw9q5WAlUhLn34tSNaKyaCdkCTi6+Tp70TaaW5aG9xw5UNj5qYDW93tuyLbtgLXPbi2UEOsupH9hEikoKGfEFJVDPBD2bfmGJZIepFzz/yO3As9aod2A== 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=ICLvsKY46TwBBTouyaWjAlTXn//H1RlTLAqgSNezE0w=; b=A44a2xPohjLr2I9JG7m3DSnCNaA/tkMmwKWHYXmgLXbxQaS2mlvjkGrEx+Ldt70JW7v5myGVobRhjIYDHbxQkmajWFl+yYQStybJzJETu5T5Cv+Hf/pAgeuy64rftWg7Fn+gVIhReoNasunprnQwifxa5VnxVIf2nsTEJd0Y+R6nKuUUgfrJa6DLwOJUxsumI9l6Eoo+rrRRfIT7BpvMNpkTSpIo7Xhs4303EVQb9q4y+kFIIAVYn5NxLD24rJv25vc5BqYIQUR8W+ZmbujrNgqc4CoeaugweU/rjGjm4/yobqjLrl5Q7qFJQ8pY4B4gU1r4gkAfC15LLVIjzcmuog== 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=ICLvsKY46TwBBTouyaWjAlTXn//H1RlTLAqgSNezE0w=; b=GenCmDXZjmb/L4BYgkC0cUO7w7s3mRwgmYcl+5JFwZVXmwrW75GtdQJ+A0KIYUv7lneAJdZKyUIEUL4pGiiLcSl5vk4aVAz0zdGX3OpnrAlPfA6Xt4PUIZoDiOgM5oLajQKATlqYg4UZJ2/gqKNYf+hhx3riofpBmpocek7raz0= Received: from BN6PR11MB3985.namprd11.prod.outlook.com (10.255.129.78) by BN6PR11MB1972.namprd11.prod.outlook.com (10.175.100.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2408.24; Tue, 5 Nov 2019 09:51:28 +0000 Received: from BN6PR11MB3985.namprd11.prod.outlook.com ([fe80::5994:7522:979f:5e29]) by BN6PR11MB3985.namprd11.prod.outlook.com ([fe80::5994:7522:979f:5e29%7]) with mapi id 15.20.2408.024; Tue, 5 Nov 2019 09:51:28 +0000 From: To: CC: , , , , Subject: [PATCH 3/6] staging: wilc1000: added 'WILC_' prefix in header guard macro Thread-Topic: [PATCH 3/6] staging: wilc1000: added 'WILC_' prefix in header guard macro Thread-Index: AQHVk76YBU8d/Q2rzEitM8uyhib/bw== Date: Tue, 5 Nov 2019 09:51:28 +0000 Message-ID: <20191105095058.24223-4-ajay.kathat@microchip.com> References: <20191105095058.24223-1-ajay.kathat@microchip.com> In-Reply-To: <20191105095058.24223-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0127.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::21) To BN6PR11MB3985.namprd11.prod.outlook.com (2603:10b6:405:7b::14) x-mailer: git-send-email 2.22.0 x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [121.244.27.38] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6bfd7fc3-49c8-402b-9c59-08d761d5ba51 x-ms-traffictypediagnostic: BN6PR11MB1972: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3631; x-forefront-prvs: 0212BDE3BE x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(396003)(376002)(136003)(346002)(39860400002)(199004)(189003)(6486002)(6436002)(2616005)(36756003)(71190400001)(486006)(186003)(86362001)(76176011)(386003)(14454004)(5640700003)(52116002)(2501003)(6512007)(64756008)(99286004)(6916009)(66446008)(66476007)(66946007)(66556008)(71200400001)(2351001)(26005)(316002)(8936002)(8676002)(50226002)(81166006)(81156014)(102836004)(6506007)(5660300002)(11346002)(1076003)(476003)(107886003)(54906003)(446003)(478600001)(25786009)(2906002)(7736002)(305945005)(4326008)(6116002)(3846002)(256004)(66066001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1972;H:BN6PR11MB3985.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: fOykZ74etlwa1O4dy46bnfUasJL8w5l6QeQYd+zVgC+HOhv+cuK48fChUx56ZdOzfpk0T5Sps4tFp865stB5G84Uoe4Jh8oGgZgYLud8/StxK/CYkERU/0PcsRaKYUdF6NKgrt2qsfnG/Y5FMYBAqIvVUGz79E0LeB6djCMsxgP/pTNGhZZ47y1kHDXTPevUmGiRt6Vad9q+QLcZoQ/JGJR1i2jmX/kiyr1MeecRE5l3IuIiNS4WTo3LE6mgIjqNz47ZH+wfRoGBiCnpVy98QP8BSdV9LclgKx2XNfojiFrt02r7wk8V/vb124xLjs+TEw0g7gISRrcwMjtz06AOozjac9dKfIaXddSg+34HcRbEjW8yGfmPJlwMtjZI9QTPCgvP/ftjpwNP57L2oY60DnnRkeFNQgcOpUiCHrm9ek9R0pm4Hbu6XZ2uxHfeVCR4 MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 6bfd7fc3-49c8-402b-9c59-08d761d5ba51 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2019 09:51:28.0931 (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: 7OBNZcug/DoqEAv25zi4ovwoPz7xfhVQ3Yxz5WMKki/IhlEeQkP9J2+zRqmWnG6MBL6o1ZCA9irjCyxda0FgY575LK5GeJ1+fyNN9qKXCKk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1972 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Use 'WILC_' prefix in header guard to follow the proper naming convention for macro name. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/cfg80211.h | 4 ++-- drivers/staging/wilc1000/hif.h | 4 ++-- drivers/staging/wilc1000/netdev.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/wilc1000/cfg80211.h b/drivers/staging/wilc1000/cfg80211.h index 05c910baf095..5e5d63f70df2 100644 --- a/drivers/staging/wilc1000/cfg80211.h +++ b/drivers/staging/wilc1000/cfg80211.h @@ -4,8 +4,8 @@ * All rights reserved. */ -#ifndef NM_WFI_CFGOPERATIONS -#define NM_WFI_CFGOPERATIONS +#ifndef WILC_CFG80211_H +#define WILC_CFG80211_H #include "netdev.h" struct wiphy *wilc_cfg_alloc(void); diff --git a/drivers/staging/wilc1000/hif.h b/drivers/staging/wilc1000/hif.h index 2defe58ab194..22ee6fffd599 100644 --- a/drivers/staging/wilc1000/hif.h +++ b/drivers/staging/wilc1000/hif.h @@ -4,8 +4,8 @@ * All rights reserved. */ -#ifndef HOST_INT_H -#define HOST_INT_H +#ifndef WILC_HIF_H +#define WILC_HIF_H #include #include "wlan_if.h" diff --git a/drivers/staging/wilc1000/netdev.h b/drivers/staging/wilc1000/netdev.h index 8bc62ce4f2f7..42e0eb192b86 100644 --- a/drivers/staging/wilc1000/netdev.h +++ b/drivers/staging/wilc1000/netdev.h @@ -4,8 +4,8 @@ * All rights reserved. */ -#ifndef WILC_WFI_NETDEVICE -#define WILC_WFI_NETDEVICE +#ifndef WILC_NETDEV_H +#define WILC_NETDEV_H #include #include From patchwork Tue Nov 5 09:51:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 11227431 X-Patchwork-Delegate: johannes@sipsolutions.net 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 06AC51747 for ; Tue, 5 Nov 2019 09:51:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D972E20869 for ; Tue, 5 Nov 2019 09:51:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="uAfoXZt/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387821AbfKEJvn (ORCPT ); Tue, 5 Nov 2019 04:51:43 -0500 Received: from esa6.microchip.iphmx.com ([216.71.154.253]:53158 "EHLO esa6.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730718AbfKEJvm (ORCPT ); Tue, 5 Nov 2019 04:51:42 -0500 Received-SPF: Pass (esa6.microchip.iphmx.com: domain of Ajay.Kathat@microchip.com designates 198.175.253.82 as permitted sender) identity=mailfrom; client-ip=198.175.253.82; receiver=esa6.microchip.iphmx.com; envelope-from="Ajay.Kathat@microchip.com"; x-sender="Ajay.Kathat@microchip.com"; x-conformance=spf_only; x-record-type="v=spf1"; x-record-text="v=spf1 mx a:ushub1.microchip.com a:smtpout.microchip.com a:mx1.microchip.iphmx.com a:mx2.microchip.iphmx.com include:servers.mcsv.net include:mktomail.com include:spf.protection.outlook.com ~all" Received-SPF: None (esa6.microchip.iphmx.com: no sender authenticity information available from domain of postmaster@email.microchip.com) identity=helo; client-ip=198.175.253.82; receiver=esa6.microchip.iphmx.com; envelope-from="Ajay.Kathat@microchip.com"; x-sender="postmaster@email.microchip.com"; x-conformance=spf_only Authentication-Results: esa6.microchip.iphmx.com; spf=Pass smtp.mailfrom=Ajay.Kathat@microchip.com; spf=None smtp.helo=postmaster@email.microchip.com; dkim=pass (signature verified) header.i=@microchiptechnology.onmicrosoft.com; dmarc=pass (p=none dis=none) d=microchip.com IronPort-SDR: ODXZjw+ruggXhmdLYLGVK1HkVMu075kiExA2STMObCRcEoYepRKbXqET1YObXR/rtWMedTpDB8 86FJ1Yzs0VxdlgfsfwDMOleSTjemk2IqPwcM/OmfxUn8F/c/7RSrFA2MbFezypLlZqi2diLmo2 ITGyCPGIecItSXt8uZgei63IHiSTlR/Bf2ZseopGd8LnXjHYrlHZ3u4X8zFWgjmNmy+vhuxrkD Z/XA9/Bm1YoHMihTc64pHzeCDnSxyMTeBshS2HDPQOhWZza30zoMCfK+SNwYA+e7GvhC8OPoz9 DKg= X-IronPort-AV: E=Sophos;i="5.68,270,1569308400"; d="scan'208";a="52914439" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 05 Nov 2019 02:51:42 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 5 Nov 2019 02:51:35 -0700 Received: from NAM05-DM3-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 5 Nov 2019 02:51:35 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XGcVNRxJV6FA+qHTUqrLeMogK98ZJyGRTvYjYYqYmFz0vNxx+O3pQcSAZKWyYSf0TSK3rjtEuhUQAnuyor6ExYj5CZvsSEgtxHzJp7iJDSPNZKVCBwT6NVTi84WhArCP6si8KP4v/yT811/oxOe/jM1Phy8HT9ltYzKssJlSBWj9ZvJPk+0KlMbL9pgXhUE0gIFUE1KoyBYj+/r71MGfhihLta5dTuowCVJ3HXSkPUFfuBXvhM4LIXVh7sqsscttLtl5UB6RXOfB46WS+7rm7j9EsfxXSvonvFSgfdAtVhlIobHKYh/clh44vwNTcyNy0xfI5i/yzyACEFgOOAEKYg== 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=OgkVpcCauAjW7gHRxD91e+dsTaBgJi9EaCzn2BouYwE=; b=OU7ZVaARgSotutpPX9ikhlvI7D6FTESfsILFyPBFT90QuuVun0OqpSvSO2eKIGyPew8c7M1/AmaS1q5C0jZOWfT12wul8vOYpSUK/jdokfvhdCUYuHAJcRyQKvww9mjfXh4/MHIhedMdWIHYrNUPODgjkNz3xBPKrIzwoFmr7fqEyjwFQ2AfQFVsCbWMNw7yG1d8CsoTDqOLBkgGsd9Yfs5DV0CpncL+PyS0fKTlmKEWKh98NKUZvukXeqa5LsACmglOxERLqyuqUSsiDFHLfzir4PHOFz8NtvagmYGmP77D9WmN+lFkFNyYwtepzvW5A07irWvZkeTLYSUxtWbxRA== 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=OgkVpcCauAjW7gHRxD91e+dsTaBgJi9EaCzn2BouYwE=; b=uAfoXZt/09+wd/gGBW1f+f0fI9Bzfv1DMTp94S8q5CJ6j99m89wcBR18n8eYck/UC7vx99ucGVUKiHnz71CBNBYR4TOLRCv5rhCNBAflewsrHiuP9bC5wCX4elK2suwcC9BnhwmA3jIclauAqxFTN1RhszlmUC81naO4YSdJAnM= Received: from BN6PR11MB3985.namprd11.prod.outlook.com (10.255.129.78) by BN6PR11MB1972.namprd11.prod.outlook.com (10.175.100.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2408.24; Tue, 5 Nov 2019 09:51:31 +0000 Received: from BN6PR11MB3985.namprd11.prod.outlook.com ([fe80::5994:7522:979f:5e29]) by BN6PR11MB3985.namprd11.prod.outlook.com ([fe80::5994:7522:979f:5e29%7]) with mapi id 15.20.2408.024; Tue, 5 Nov 2019 09:51:31 +0000 From: To: CC: , , , , Subject: [PATCH 4/6] staging: wilc1000: avoid use of C++ style comments Thread-Topic: [PATCH 4/6] staging: wilc1000: avoid use of C++ style comments Thread-Index: AQHVk76ZTWlKQCuDbU+TzJqUPm4zvg== Date: Tue, 5 Nov 2019 09:51:30 +0000 Message-ID: <20191105095058.24223-5-ajay.kathat@microchip.com> References: <20191105095058.24223-1-ajay.kathat@microchip.com> In-Reply-To: <20191105095058.24223-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0127.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::21) To BN6PR11MB3985.namprd11.prod.outlook.com (2603:10b6:405:7b::14) x-mailer: git-send-email 2.22.0 x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [121.244.27.38] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 853f413d-cc33-44e4-c36f-08d761d5bbea x-ms-traffictypediagnostic: BN6PR11MB1972: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:296; x-forefront-prvs: 0212BDE3BE x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(396003)(376002)(136003)(346002)(39860400002)(199004)(189003)(6486002)(6436002)(2616005)(36756003)(71190400001)(486006)(186003)(86362001)(76176011)(386003)(14454004)(5640700003)(52116002)(2501003)(6512007)(64756008)(99286004)(6916009)(66446008)(66476007)(66946007)(66556008)(71200400001)(2351001)(26005)(316002)(8936002)(8676002)(50226002)(81166006)(81156014)(102836004)(6506007)(4744005)(5660300002)(11346002)(1076003)(476003)(107886003)(54906003)(446003)(478600001)(25786009)(2906002)(7736002)(305945005)(4326008)(6116002)(3846002)(256004)(14444005)(66066001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1972;H:BN6PR11MB3985.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: lF9G2j2JbGGyylRVhaPwh81xL/GubiMNViH/XriZpYJoIVQjxOW0Z30+IiXllMG7L/H2Ezc6ZU1+73vOSH3SIy5bg4JivXdk9S5AL3shpxrIqOn73QApV3iW4tWgJvckQCf7TPCmzC3HAzMolqGly/3M/tr9NXvX74iyw4tp23H+JsRJ8ru5k0deNHanAi0UfORux7VF4SaELnAnFhVw8ae3v9HFPdJNI/UB7w/2UZyZiCKz0rqi8xiHP3c29jD1yLHr3v8MWhGK7aYH9xDQxMIiVfioV5zw9fVo8r0v9kRTyybg92HJfdUiMQS4SUONjR8m80LNdrnRaBszjXRrVrF+TXPtugt0luw8SAb09UhijUHrcuSd/3GiqQ8z96GF2XIXiYOpC018R0cDKgYgL5xI2YzY2yqgV2LEuPWt4/r53o03Y3EQqmqME2prgUQy MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 853f413d-cc33-44e4-c36f-08d761d5bbea X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2019 09:51:30.9325 (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: U6CaOReskCoV4Oo6TzJqNl86LeKdotfy5UY3uwgI5M8p0T8uyN38MD4nL8GQxUluH/na25r9t3lB1CzvfBeCm4Qgpf0vZyJ+/YwciGnz8S0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1972 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Replace C++ style comment with C style. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/hif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wilc1000/hif.c b/drivers/staging/wilc1000/hif.c index 25f035c02b10..5f6706bcedf6 100644 --- a/drivers/staging/wilc1000/hif.c +++ b/drivers/staging/wilc1000/hif.c @@ -552,7 +552,7 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, param->mode_802_11i = 2; param->rsn_found = true; - //extract RSN capabilities + /* extract RSN capabilities */ offset += (rsn_ie[offset] * 4) + 2; offset += (rsn_ie[offset] * 4) + 2; memcpy(param->rsn_cap, &rsn_ie[offset], 2); From patchwork Tue Nov 5 09:51:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 11227427 X-Patchwork-Delegate: johannes@sipsolutions.net 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 06C121390 for ; Tue, 5 Nov 2019 09:51:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D0966217F5 for ; Tue, 5 Nov 2019 09:51:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="rx9juNw1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387866AbfKEJvn (ORCPT ); Tue, 5 Nov 2019 04:51:43 -0500 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:55789 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730583AbfKEJvn (ORCPT ); Tue, 5 Nov 2019 04:51:43 -0500 Received-SPF: Pass (esa5.microchip.iphmx.com: domain of Ajay.Kathat@microchip.com designates 198.175.253.82 as permitted sender) identity=mailfrom; client-ip=198.175.253.82; receiver=esa5.microchip.iphmx.com; envelope-from="Ajay.Kathat@microchip.com"; x-sender="Ajay.Kathat@microchip.com"; x-conformance=spf_only; x-record-type="v=spf1"; x-record-text="v=spf1 mx a:ushub1.microchip.com a:smtpout.microchip.com a:mx1.microchip.iphmx.com a:mx2.microchip.iphmx.com include:servers.mcsv.net include:mktomail.com include:spf.protection.outlook.com ~all" Received-SPF: None (esa5.microchip.iphmx.com: no sender authenticity information available from domain of postmaster@email.microchip.com) identity=helo; client-ip=198.175.253.82; receiver=esa5.microchip.iphmx.com; envelope-from="Ajay.Kathat@microchip.com"; x-sender="postmaster@email.microchip.com"; x-conformance=spf_only Authentication-Results: esa5.microchip.iphmx.com; spf=Pass smtp.mailfrom=Ajay.Kathat@microchip.com; spf=None smtp.helo=postmaster@email.microchip.com; dkim=pass (signature verified) header.i=@microchiptechnology.onmicrosoft.com; dmarc=pass (p=none dis=none) d=microchip.com IronPort-SDR: v2y9UtyJ+v9xdzPheXDGZRUS8CU9kHO/ieWzqIxOJwkQpaIL4gln1IFQE4TBd4TT6iAT2mykR5 Prn0pnEVR4QH/zOXZsAzivBiBMqnZgMvNTbbyviLbMJFxEQzlQeJbAEUVDuZBH+R4EkSQV7ByN oRx2bnNwlaZlkTmw68foqia0iMCn3hgxUKFBlH8gkRVTBByw1IqnQhnLb8RygnPu7fmo9G7DvP rNHsuRxVZn93GRtHDEB7QHmGAA797Ixyjjpq2H0pQI6saSf+YzzOn31Y/sttN4c4X9KWCpcrbP f9M= X-IronPort-AV: E=Sophos;i="5.68,270,1569308400"; d="scan'208";a="54166709" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 05 Nov 2019 02:51:41 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 5 Nov 2019 02:51:35 -0700 Received: from NAM05-DM3-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 5 Nov 2019 02:51:35 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hFuqX1pwz6NyjWUgjFnsT37GTWOaJiuE6V8ZU4jDtiTLtS4skKsa8TfqhmrkeckG0znuDL2bideiK9l0v9qYdh9K5vAZVEOUvMdIRQEpcmZuk2E55YQnpi4XKtoV3GtLqTzcz5EUTDKHvKPHn3JQvmYapE6QP6aOyPmmogRAPtTwQAnqhzZdXGvCpAQMtOMw3PB35T73Oc5w80wrsFtDDIQtzH5EzxUnGv/3cYF+C07nkgR+R2f/8BCP9JofYAf8Egbgkw8bweDZ7Nc2XF5F6PVLUYkgQXoDT95m30LW+pXUFwpv5KM9FT32vinFrUTRFSNNejq36UFjsAo2WnNWsQ== 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=Bbjw6EEhk7b5MvuVWJsD0hxRoURNRjcJfkWEDT3Aw4E=; b=Zg5jXCxIAgVi8ON3iyhRbAs/1kDh09iUiADZkm0GXu+4pIOpzC+y+Vvg+sBjKiavdMOr2LxjmKcSMv2tglyQyGiTjGyX5ajuenkttNF/oh/LbNooPoL0844PJF4c3+RamUd8MGpRiW7tZt0dOv3//U5goO9G7fh9DQIyJXRD2uPO7BfGXu7RHFpEb22wC0Qysq0W03c3kSJjIyjHoGeTAtyxaXMzX9E4U3XAyc3WvXwPhJAwOlFTwy5/C12xUB5QGmhrhywX2lQKekO/XUJkepyLqzKjkCkIxjGPv0UWzdgLxYpBO4DUGHDovdb97ynWEUPnF6Wdxq+Dj1OUlON3og== 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=Bbjw6EEhk7b5MvuVWJsD0hxRoURNRjcJfkWEDT3Aw4E=; b=rx9juNw10xH3cQWY8NypkAqaqrB0YeLUbi9rSwK1Wbi/NDofEhPLRxdfFGQyAKu31K/H1d/B5UmevsRi2H1nrVIh/QtMVESC7LQ/RHzZv6O1RChB856jT/bbVB/wdbHAGIBXM1lqCIWj/7w0G21+UfZx1Zwr7CR27N5l9udQXBY= Received: from BN6PR11MB3985.namprd11.prod.outlook.com (10.255.129.78) by BN6PR11MB1972.namprd11.prod.outlook.com (10.175.100.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2408.24; Tue, 5 Nov 2019 09:51:34 +0000 Received: from BN6PR11MB3985.namprd11.prod.outlook.com ([fe80::5994:7522:979f:5e29]) by BN6PR11MB3985.namprd11.prod.outlook.com ([fe80::5994:7522:979f:5e29%7]) with mapi id 15.20.2408.024; Tue, 5 Nov 2019 09:51:34 +0000 From: To: CC: , , , , Subject: [PATCH 5/6] staging: wilc1000: added proper spacing for comments Thread-Topic: [PATCH 5/6] staging: wilc1000: added proper spacing for comments Thread-Index: AQHVk76bJBrmfkaY5U6CWW3A8Q5NZQ== Date: Tue, 5 Nov 2019 09:51:33 +0000 Message-ID: <20191105095058.24223-6-ajay.kathat@microchip.com> References: <20191105095058.24223-1-ajay.kathat@microchip.com> In-Reply-To: <20191105095058.24223-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0127.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::21) To BN6PR11MB3985.namprd11.prod.outlook.com (2603:10b6:405:7b::14) x-mailer: git-send-email 2.22.0 x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [121.244.27.38] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1e421f66-2ccc-447f-6224-08d761d5bd9d x-ms-traffictypediagnostic: BN6PR11MB1972: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2887; x-forefront-prvs: 0212BDE3BE x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(396003)(376002)(136003)(346002)(39860400002)(199004)(189003)(6486002)(6436002)(2616005)(36756003)(71190400001)(486006)(186003)(86362001)(76176011)(386003)(14454004)(5640700003)(52116002)(2501003)(6512007)(64756008)(99286004)(6916009)(66446008)(66476007)(66946007)(66556008)(71200400001)(2351001)(26005)(316002)(8936002)(8676002)(50226002)(81166006)(81156014)(102836004)(6506007)(5660300002)(11346002)(1076003)(476003)(107886003)(54906003)(446003)(478600001)(25786009)(2906002)(7736002)(305945005)(4326008)(6116002)(3846002)(256004)(14444005)(66066001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1972;H:BN6PR11MB3985.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: kvd6wlnvILy42uZE/cg5v5xqmL8d1TcxdCOTHqk2xAMyYOaf57Jl0/+AQJ7nXwxULcgKKS2pu4lK4pXaTC//oFb7WRUJ2wC9dfUfS9/18VVyaZML0mJ/rX/XfVl8qidG+MpZeQFSUR+Vj9xn+14baMSSCdV4MzHFEPKTlBkCu/L7nnKsTM40XddMfErGcTNMjSktVMiQ/zbZnNMHuvudl4Zf4P7UtRVedebHnJdv1hl67vg95pFD1YMg5Q6DUccfdR3LBN0swDS88Hb8An98+kHfFRIWoIx+8BsqhnxaFSNSNGP1mkOs9I9TDeLp2X2JikSB8SPc43MoX9bByv1PvVKbqmr8+5Qb7ECQmq2zDPRz4zfDgs/ZuaBkNz9FPxrxSfSbRvhD8WjWRkE3WBxzsRt8OShUovsWheECPIf03KTwKuXsQwJYunAL11pQg4xB MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 1e421f66-2ccc-447f-6224-08d761d5bd9d X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2019 09:51:33.8387 (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: nIm0r85//9WPHfH8eCLsVurr/Ufxt06J/9H8G+swAzjIl+dDduuobj7Cr2PvhDwO6RmE/T5RO1MS3aMiJoJ8q5i5eWDJj+0bhgn+IQAr/Tw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1972 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Added proper space for the comments and added newline before the comments inside a struct. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/mon.c | 2 +- drivers/staging/wilc1000/netdev.h | 19 ++++++++++++++----- drivers/staging/wilc1000/wlan.h | 2 +- drivers/staging/wilc1000/wlan_cfg.c | 2 +- drivers/staging/wilc1000/wlan_if.h | 8 ++++---- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/staging/wilc1000/mon.c b/drivers/staging/wilc1000/mon.c index 853fe3056a53..48ac33f06f63 100644 --- a/drivers/staging/wilc1000/mon.c +++ b/drivers/staging/wilc1000/mon.c @@ -220,7 +220,7 @@ struct net_device *wilc_wfi_init_mon_interface(struct wilc *wl, { struct wilc_wfi_mon_priv *priv; - /*If monitor interface is already initialized, return it*/ + /* If monitor interface is already initialized, return it */ if (wl->monitor_dev) return wl->monitor_dev; diff --git a/drivers/staging/wilc1000/netdev.h b/drivers/staging/wilc1000/netdev.h index 42e0eb192b86..cd8f0d72caaa 100644 --- a/drivers/staging/wilc1000/netdev.h +++ b/drivers/staging/wilc1000/netdev.h @@ -60,7 +60,7 @@ struct sta_info { u8 sta_associated_bss[WILC_MAX_NUM_STA][ETH_ALEN]; }; -/*Parameters needed for host interface for remaining on channel*/ +/* Parameters needed for host interface for remaining on channel */ struct wilc_wfi_p2p_listen_params { struct ieee80211_channel *listen_ch; u32 listen_duration; @@ -145,11 +145,13 @@ struct wilc_priv { struct wilc_pmkid_attr pmkid_list; u8 wep_key[4][WLAN_KEY_LEN_WEP104]; u8 wep_key_len[4]; + /* The real interface that the monitor is on */ struct net_device *real_ndev; struct wilc_wfi_key *wilc_gtk[WILC_MAX_NUM_STA]; struct wilc_wfi_key *wilc_ptk[WILC_MAX_NUM_STA]; u8 wilc_groupkey; + /* mutexes */ struct mutex scan_req_lock; bool p2p_listen_state; @@ -224,16 +226,21 @@ struct wilc { int close; u8 vif_num; struct list_head vif_list; - /*protect vif list*/ + + /* protect vif list */ struct mutex vif_mutex; struct srcu_struct srcu; u8 open_ifcs; - /*protect head of transmit queue*/ + + /* protect head of transmit queue */ struct mutex txq_add_to_head_cs; - /*protect txq_entry_t transmit queue*/ + + /* protect txq_entry_t transmit queue */ spinlock_t txq_spinlock; - /*protect rxq_entry_t receiver queue*/ + + /* protect rxq_entry_t receiver queue */ struct mutex rxq_cs; + /* lock to protect hif access */ struct mutex hif_cs; @@ -245,6 +252,7 @@ struct wilc { struct task_struct *txq_thread; int quit; + /* lock to protect issue of wid command to firmware */ struct mutex cfg_cmd_lock; struct wilc_cfg_frame cfg_frame; @@ -271,6 +279,7 @@ struct wilc { struct wilc_cfg cfg; void *bus_data; struct net_device *monitor_dev; + /* deinit lock */ struct mutex deinit_lock; u8 sta_ch; diff --git a/drivers/staging/wilc1000/wlan.h b/drivers/staging/wilc1000/wlan.h index 7469fa47d588..1f6957cf2e9c 100644 --- a/drivers/staging/wilc1000/wlan.h +++ b/drivers/staging/wilc1000/wlan.h @@ -190,7 +190,7 @@ #define ENABLE_RX_VMM (SEL_VMM_TBL1 | EN_VMM) #define ENABLE_TX_VMM (SEL_VMM_TBL0 | EN_VMM) -/*time for expiring the completion of cfg packets*/ +/* time for expiring the completion of cfg packets */ #define WILC_CFG_PKTS_TIMEOUT msecs_to_jiffies(2000) #define IS_MANAGMEMENT 0x100 diff --git a/drivers/staging/wilc1000/wlan_cfg.c b/drivers/staging/wilc1000/wlan_cfg.c index 904f84077ff7..c5b1678c7b5e 100644 --- a/drivers/staging/wilc1000/wlan_cfg.c +++ b/drivers/staging/wilc1000/wlan_cfg.c @@ -378,7 +378,7 @@ void wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size, wilc_wlan_parse_info_frame(wilc, frame); rsp->type = WILC_CFG_RSP_STATUS; rsp->seq_no = msg_id; - /*call host interface info parse as well*/ + /* call host interface info parse as well */ wilc_gnrl_async_info_received(wilc, frame - 4, size + 4); break; diff --git a/drivers/staging/wilc1000/wlan_if.h b/drivers/staging/wilc1000/wlan_if.h index 70eac586f80c..7c7ee66c35f5 100644 --- a/drivers/staging/wilc1000/wlan_if.h +++ b/drivers/staging/wilc1000/wlan_if.h @@ -750,10 +750,10 @@ enum { WID_REMOVE_KEY = 0x301E, WID_ASSOC_REQ_INFO = 0x301F, WID_ASSOC_RES_INFO = 0x3020, - WID_MANUFACTURER = 0x3026, /*Added for CAPI tool */ - WID_MODEL_NAME = 0x3027, /*Added for CAPI tool */ - WID_MODEL_NUM = 0x3028, /*Added for CAPI tool */ - WID_DEVICE_NAME = 0x3029, /*Added for CAPI tool */ + WID_MANUFACTURER = 0x3026, /* Added for CAPI tool */ + WID_MODEL_NAME = 0x3027, /* Added for CAPI tool */ + WID_MODEL_NUM = 0x3028, /* Added for CAPI tool */ + WID_DEVICE_NAME = 0x3029, /* Added for CAPI tool */ /* NMAC String WID list */ WID_SET_OPERATION_MODE = 0x3079, From patchwork Tue Nov 5 09:51: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: 11227429 X-Patchwork-Delegate: johannes@sipsolutions.net 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 C2B9216B1 for ; Tue, 5 Nov 2019 09:51:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 983EC217F5 for ; Tue, 5 Nov 2019 09:51:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="Bf9WbpTW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387952AbfKEJvo (ORCPT ); Tue, 5 Nov 2019 04:51:44 -0500 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:55789 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387656AbfKEJvn (ORCPT ); Tue, 5 Nov 2019 04:51:43 -0500 Received-SPF: Pass (esa5.microchip.iphmx.com: domain of Ajay.Kathat@microchip.com designates 198.175.253.82 as permitted sender) identity=mailfrom; client-ip=198.175.253.82; receiver=esa5.microchip.iphmx.com; envelope-from="Ajay.Kathat@microchip.com"; x-sender="Ajay.Kathat@microchip.com"; x-conformance=spf_only; x-record-type="v=spf1"; x-record-text="v=spf1 mx a:ushub1.microchip.com a:smtpout.microchip.com a:mx1.microchip.iphmx.com a:mx2.microchip.iphmx.com include:servers.mcsv.net include:mktomail.com include:spf.protection.outlook.com ~all" Received-SPF: None (esa5.microchip.iphmx.com: no sender authenticity information available from domain of postmaster@email.microchip.com) identity=helo; client-ip=198.175.253.82; receiver=esa5.microchip.iphmx.com; envelope-from="Ajay.Kathat@microchip.com"; x-sender="postmaster@email.microchip.com"; x-conformance=spf_only Authentication-Results: esa5.microchip.iphmx.com; spf=Pass smtp.mailfrom=Ajay.Kathat@microchip.com; spf=None smtp.helo=postmaster@email.microchip.com; dkim=pass (signature verified) header.i=@microchiptechnology.onmicrosoft.com; dmarc=pass (p=none dis=none) d=microchip.com IronPort-SDR: eekW4axk6KOvWiidnwkT18moKo9Yarwuam5C3/aYGjMG0eGCHhVE06zJ6lOe65npQ8AzUlYNR5 MNLgOGGfNDQKOM+cbpA35fp8EwmMMSdDvDIBT1r8/EGbYfWAcaQdV/9EQR+4NmEYD84Z+GMqaM yWE5KenV7XJGCBuANOE3bQJJzSoO/HgV35RFppS3mXnQ8VhNqPihSzydmy93GohNwpZlLaUPQ1 xEuOR5dR+vBLwcEndPj3hjDXq5vu9RFA71g/OlOenCpgzWQVcJIHMUA5VMSvczIdBqTdTZF7Zp NRk= X-IronPort-AV: E=Sophos;i="5.68,270,1569308400"; d="scan'208";a="54166711" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 05 Nov 2019 02:51:42 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 5 Nov 2019 02:51:37 -0700 Received: from NAM05-DM3-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 5 Nov 2019 02:51:37 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y8cYPplypZ/MLDjWz65MAt7xr0+I5js3qkuoOeAk6C18HJStlMmlo3ccyqhU49B987OxEyYkZYJNcmoVnTrydScYx/YBNnhmkSiKxe0SNoF2JSuUZCdOjRohwrGDpJsuu2lsBukqxMX7MYO42IqsfXf0CgHt58fPL8dywPz34ouoepW5H0NQBb2ceyru0G+HHj5MX7w0eWlFcttcN0JqB5Pka4WtDPuvrAEddLcvtXwLWP/vBx9RyBegR9zWLnsbrmRE6iAZe95DS3YWjTQx855bHF//Cim4xXMNpVoOGyZLTHxySYMLgy+54vYw2xW9LAuJnDVBn9MMAqjY53aP9w== 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=s2h5wLRUd/IONeAju+PBwRnp7wNYSWOXJxt5ZT7AD9k=; b=N2S0LdE0jeZ70RT41/Pk0FI6sVW0pqgt+ikndVxGXfhV5neuRbi2yDz3yN9jICalPkYKcgU3LeYT5uBosmxDz4BM1lMAdCWLhARMM7PLUZxLYzPspS2Nylq/bAx3wNc6tO+95KGRRsBu/pW3f5/N99qTgv+Vmz8n8E2DPsEzo1WQ+rprGViat3YjWBNrP/wyLIrx0spiDGm0VnylNu3DQEEYgeRZ2RbZoUzLz98F4Vg6sWprNyprseX8cj5MfeeXUqj4W680vp8mnxoDVuwDtE9QeJrns50m4LFzwnjrRi2xDGSgTy5tGkzPZrL9Pad31nd6YVL6Wx25ORX9hzTrhw== 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=s2h5wLRUd/IONeAju+PBwRnp7wNYSWOXJxt5ZT7AD9k=; b=Bf9WbpTW36xofwT8BotQr0TetaWwRFfnXAh1LE1XTxEb9oBsxiKvBFYKq2vrUM3/d5aP+ZRsDQFdKxE2BT+Bx/UOYXHd1xIl1xFixluJAayngpqUs31YxYhtEzBjVlvF+5N4LOdB8Y1IUEeHn4VFzGaJD/xiTN76lKpeJR5FdpE= Received: from BN6PR11MB3985.namprd11.prod.outlook.com (10.255.129.78) by BN6PR11MB1972.namprd11.prod.outlook.com (10.175.100.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2408.24; Tue, 5 Nov 2019 09:51:36 +0000 Received: from BN6PR11MB3985.namprd11.prod.outlook.com ([fe80::5994:7522:979f:5e29]) by BN6PR11MB3985.namprd11.prod.outlook.com ([fe80::5994:7522:979f:5e29%7]) with mapi id 15.20.2408.024; Tue, 5 Nov 2019 09:51:36 +0000 From: To: CC: , , , , Subject: [PATCH 6/6] staging: wilc1000: use defines for msg types received from firmware Thread-Topic: [PATCH 6/6] staging: wilc1000: use defines for msg types received from firmware Thread-Index: AQHVk76cLI+M2vYE4kiXn40twMiKZw== Date: Tue, 5 Nov 2019 09:51:36 +0000 Message-ID: <20191105095058.24223-7-ajay.kathat@microchip.com> References: <20191105095058.24223-1-ajay.kathat@microchip.com> In-Reply-To: <20191105095058.24223-1-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0127.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::21) To BN6PR11MB3985.namprd11.prod.outlook.com (2603:10b6:405:7b::14) x-mailer: git-send-email 2.22.0 x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [121.244.27.38] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 686562e1-5bb1-451a-8693-08d761d5bf5a x-ms-traffictypediagnostic: BN6PR11MB1972: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-forefront-prvs: 0212BDE3BE x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(396003)(376002)(136003)(346002)(39860400002)(199004)(189003)(6486002)(6436002)(2616005)(36756003)(71190400001)(486006)(186003)(86362001)(76176011)(386003)(14454004)(5640700003)(52116002)(2501003)(6512007)(64756008)(99286004)(6916009)(66446008)(66476007)(66946007)(66556008)(71200400001)(2351001)(26005)(316002)(8936002)(8676002)(50226002)(81166006)(81156014)(102836004)(6506007)(5660300002)(11346002)(1076003)(476003)(107886003)(54906003)(446003)(478600001)(25786009)(2906002)(7736002)(305945005)(4326008)(6116002)(3846002)(256004)(66066001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR11MB1972;H:BN6PR11MB3985.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: t49OD4v/zwjKxXZM1YqBbs8UFQhyRKD4XWtiTSMy9Dm+qJ+HrD7X/iW/IbPZ1twy386X2Sx5wkJXaAxtlLy+hnjNDfT5r/3OM7JyajtFe4y1XQMpf3lW59dcQTvX3taSS3MpME/Af5nKiyjlS3LYj7ns9oWfAzvl8zm5SO9IRK1jU1bzu3LaJilkqoJuZBRVNjgKsTslvN5gj1n3UWtj7pTXlpD9cRPFH8SPGE8p25tr23/+b6wo81XH2t1L/ZjoZsuz4NvShxSNj55eJTrZIuJrHl6xrkSrPQQCeLSITCXMaC3XyqPEJ68aS2LQeiciGEq1Y2kRBQZVUftnZnGgbF5iungMQXQjK0E7+FcNXIanUxAVvoRraatdJJg6PViBUUkwWjM/WNAG3ZUba1kP+/Z+AU8gfMf40uU1vdEcnnOjZLVApaNukOkU2r2FgFkz MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 686562e1-5bb1-451a-8693-08d761d5bf5a X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2019 09:51:36.4562 (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: jZJv4N8luI+1fmG+CFwcx41zLnEe7zMdg07b7KBNMFqbLu5wRy6/2MSrjjdzWQI+UEwHkZ7ws79uwWNPVCir7Jp1XvLL2V0dZCMStHddzdQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1972 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ajay Singh Added defines for different types of messages received from firmware. Removed the unnecessary comments because after the addition of macros the message types are self-explanatory. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/wlan_cfg.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/staging/wilc1000/wlan_cfg.c b/drivers/staging/wilc1000/wlan_cfg.c index c5b1678c7b5e..6f6b286788d1 100644 --- a/drivers/staging/wilc1000/wlan_cfg.c +++ b/drivers/staging/wilc1000/wlan_cfg.c @@ -44,6 +44,11 @@ static const struct wilc_cfg_str g_cfg_str[] = { {WID_NIL, NULL} }; +#define WILC_RESP_MSG_TYPE_CONFIG_REPLY 'R' +#define WILC_RESP_MSG_TYPE_STATUS_INFO 'I' +#define WILC_RESP_MSG_TYPE_NETWORK_INFO 'N' +#define WILC_RESP_MSG_TYPE_SCAN_COMPLETE 'S' + /******************************************** * * Configuration Functions @@ -360,21 +365,14 @@ void wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size, size -= 4; rsp->type = 0; - /* - * The valid types of response messages are - * 'R' (Response), - * 'I' (Information), and - * 'N' (Network Information) - */ - switch (msg_type) { - case 'R': + case WILC_RESP_MSG_TYPE_CONFIG_REPLY: wilc_wlan_parse_response_frame(wilc, frame, size); rsp->type = WILC_CFG_RSP; rsp->seq_no = msg_id; break; - case 'I': + case WILC_RESP_MSG_TYPE_STATUS_INFO: wilc_wlan_parse_info_frame(wilc, frame); rsp->type = WILC_CFG_RSP_STATUS; rsp->seq_no = msg_id; @@ -382,11 +380,11 @@ void wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size, wilc_gnrl_async_info_received(wilc, frame - 4, size + 4); break; - case 'N': + case WILC_RESP_MSG_TYPE_NETWORK_INFO: wilc_network_info_received(wilc, frame - 4, size + 4); break; - case 'S': + case WILC_RESP_MSG_TYPE_SCAN_COMPLETE: wilc_scan_complete_received(wilc, frame - 4, size + 4); break;