From patchwork Thu Feb 7 11:28:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800877 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD2D713B5 for ; Thu, 7 Feb 2019 11:29:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A73B32A847 for ; Thu, 7 Feb 2019 11:29:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96E5C2A859; Thu, 7 Feb 2019 11:29:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44E8A2A847 for ; Thu, 7 Feb 2019 11:29:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726965AbfBGL3B (ORCPT ); Thu, 7 Feb 2019 06:29:01 -0500 Received: from esa6.microchip.iphmx.com ([216.71.154.253]:29552 "EHLO esa6.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726880AbfBGL3B (ORCPT ); Thu, 7 Feb 2019 06:29:01 -0500 X-IronPort-AV: E=Sophos;i="5.58,343,1544511600"; d="scan'208";a="23538661" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 04:29:00 -0700 Received: from NAM05-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.49) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 04:29:00 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BTO6/t8e4z26fe6YXYxSZQJ4Yv8ovnL5UBW+MIwBjNY=; b=V2OKkZToxcjHNyasuHQjLrk7zqRZw4J4dYuntufPZ4khmE7sqVQg7uEyKzKakUm/cElnJ+9YTUURagwZRplcTxD1WJHMmrvlpAIlH4mQOHVle4UPqCIhn/r6HchNr2770IUJlRM0+F3Fm5RjkiBHWy0+6GqcLtKy0xqj+O/3A3U= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB2792.namprd11.prod.outlook.com (52.135.228.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 7 Feb 2019 11:28:58 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 11:28:58 +0000 From: To: CC: , , , , , Subject: [PATCH v2 1/8] staging: wilc1000: fix to set correct value for 'vif_num' Thread-Topic: [PATCH v2 1/8] staging: wilc1000: fix to set correct value for 'vif_num' Thread-Index: AQHUvthRCWtCjrOwjE+cjJZP1E/4FQ== Date: Thu, 7 Feb 2019 11:28:58 +0000 Message-ID: <1549538913-17463-2-git-send-email-ajay.kathat@microchip.com> References: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0060.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:20::22) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [27.59.126.210] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB2792;6:36RR0B5yVzbzxXxqqU3AJgyiXx5G0+4k619vQcbNQ5IfeUWl14wZQwQNasx7g6DYsT4ijOgncdIkD9/I0ykEMtu2/PNruYpEzCy4Tdqa4yRiBmcVWbwauCDNG8NVs76vYHd+O7TRWd/kgacdMKrl4LQ7k5DIOFUFCP53/yFcWjU0r3Vcl+Yb+YI7wkrcIlXcYpd4NZEbHx46paUfu5/X6IaQk6GrAGqyQ3bYjn2HwWbKYaiYVfycBM+7JTXxoAsArsKs4GxbcWmSRHRL9QlGCu7vtEE9toIUdHU5XVZg1HilxryEqSOftjHI6Vi1m55QORxEuDgMb9RA9gAm5FXRDS/jpCn4yIf+/7bZWVYNjy7fzmITaJ+JpYMLcYiNG29+SlYHinn1lKA7dXU4OKsfSFPaDlH9R48OJNqJg7mvS8umCGlwzArdrcCYUUe7qoQ5ORrprhOqzbXKy+FVg7QT/Q==;5:CgVQ23MO30hz68Yhjj41Nai1Nz1x6qLfzFq7hjYNhcdZMSumK051BOjd/W2YT5AJy7oJk3IQzeFvcUO8xrTV6+KtQae0f/mwtiqP5JygdkGMVcDqxA2PtqLEgu1+owHX7cFYMXStPgR4t2+4KjsEcQ0HKTnQL+9nN9/MfT6/lb2/5UBM0BY7TdGDCdwMZe8UMSjP/NH9SsorDIHo3cAQ3g==;7:Euq45yUttXaqvFqcDdE+zSJRS0U4Jeyd10ggEY2UcooLsJUdSY1rRKbkmocDAwPDpXhKs7F+QN/eyYuJNZcXYzTcOudvWOKH76kCTL2Ij37fFsPeife5FP/c1+ICyPIq4apRacioUmYNFaHd+px+lw== x-ms-office365-filtering-correlation-id: 909443f5-c091-4ccd-a392-08d68cef737b x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB2792; x-ms-traffictypediagnostic: BYAPR11MB2792: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(136003)(346002)(366004)(376002)(39860400002)(189003)(199004)(4744005)(2501003)(256004)(7736002)(68736007)(81166006)(81156014)(305945005)(186003)(8676002)(8936002)(66066001)(50226002)(97736004)(52116002)(4326008)(11346002)(86362001)(316002)(25786009)(476003)(2616005)(54906003)(478600001)(6486002)(105586002)(486006)(6916009)(106356001)(6436002)(14454004)(6512007)(53936002)(2906002)(2351001)(71200400001)(71190400001)(6116002)(3846002)(386003)(6506007)(446003)(76176011)(36756003)(26005)(5640700003)(102836004)(99286004)(72206003);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB2792;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: F7mjiJJTrt+KwFCYj/zw77SAo2Jdf33VX+xkRJfZhpKNPgTbYXYjsWaZzCD3HtKowD0iVloNnfvLVq0PPO7Faw+O/o8fU40W1SeLCdak1lSzOGSQHOITySNGbZXsw6S51LpkKHOZU6tXJMeJg09iircH7vD0EIHaIYgSHuwKp2NdjRHwQAVfpGuhkIEcsyGOatT0rIZeSJ7MRSSz/HrUDntXHE67xDXaiuyAFQpQTeZl6RzuKN46Z67bZyRdafKiOSfB69mJDuVzHm4fc3T5Hh3o/nBjkQnUUZjT3pjx2894UZU8jKDYKGvnJgfvfHGtbD0Q5OE6QqlT0ZPTjWNm/RyGvI4RQtUc0zccvqHGnPvi9wpHuZGTVDOrMFwX/Pa05UrxS7MMx34Mu25cBireK0cTkVz8Qo5lH/cpRUWBJsU= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 909443f5-c091-4ccd-a392-08d68cef737b X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 11:28:55.5540 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2792 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Set correct value in '->vif_num' for the total number of interfaces and set '->idx' value using 'i'. Fixes: 735bb39ca3be ("staging: wilc1000: simplify vif[i]->ndev accesses") Fixes: 0e490657c721 ("staging: wilc1000: Fix problem with wrong vif index") Cc: Suggested-by: Dan Carpenter Signed-off-by: Ajay Singh Reviewed-by: Dan Carpenter --- drivers/staging/wilc1000/linux_wlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index f096f9e..f3e52af 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1020,8 +1020,8 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, vif->wilc = *wilc; vif->ndev = ndev; wl->vif[i] = vif; - wl->vif_num = i; - vif->idx = wl->vif_num; + wl->vif_num = i + 1; + vif->idx = i; ndev->netdev_ops = &wilc_netdev_ops; From patchwork Thu Feb 7 11:29:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800879 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CAC956C2 for ; Thu, 7 Feb 2019 11:29:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9C6D2A859 for ; Thu, 7 Feb 2019 11:29:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADA192A862; Thu, 7 Feb 2019 11:29:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7ED0A2A859 for ; Thu, 7 Feb 2019 11:29:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726974AbfBGL3F (ORCPT ); Thu, 7 Feb 2019 06:29:05 -0500 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:42837 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726740AbfBGL3F (ORCPT ); Thu, 7 Feb 2019 06:29:05 -0500 X-IronPort-AV: E=Sophos;i="5.56,564,1539673200"; d="scan'208";a="24333086" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 04:29:04 -0700 Received: from NAM05-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.108) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 04:29:03 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=I4ICCQWT/wydC+ychRlHjAkiSOwS/HLjstbw2+YOVXU=; b=ZPZhbf176vyeEO9zH4ca3+LBdnXACLowHK4IkBDpwrkmGnltaEAVgm31HeHEO3d3svVCPSon2z4xcowgq9Yhmi2xp0j/VuEmPK8qNRkKN1Fzh4psfJ8NF7X3S/uyi2Ho9TFOxEVX3kCfutvQ3v97f1ukrpDEkfcOrgEn42og8Pg= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB2792.namprd11.prod.outlook.com (52.135.228.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 7 Feb 2019 11:29:01 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 11:29:01 +0000 From: To: CC: , , , , Subject: [PATCH v2 2/8] staging: wilc1000: add 'wilc_' prefix to have proper namespace Thread-Topic: [PATCH v2 2/8] staging: wilc1000: add 'wilc_' prefix to have proper namespace Thread-Index: AQHUvthTaXeExNI/i0W2fgH/vGPO6Q== Date: Thu, 7 Feb 2019 11:29:01 +0000 Message-ID: <1549538913-17463-3-git-send-email-ajay.kathat@microchip.com> References: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0060.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:20::22) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [27.59.126.210] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB2792;6:uZd2bLHFfyRTVhKkuWmEO3lI85fMNu0rurLuZlBrsqzkYTYgA4kT8FhHHXJUaJbIfhjI+Zbh/ZI42OaQYYN+nY6HUUgRiaIY8maAQioxnED8VekzOj/uewdoXUePnssBguTuI4p8VE06SsxgScUBNJ2a2WGBKIbU1MCZGW7W7+HfVVko6nGzjSCCtqBUoGDpGrpFhDbfQPmwWSSo/FpD918ZWm8jKxTzn5WivYosY+Ln4zq58/UQ/iPBROnZC8Y5YYH7SCqlBToCWKwhroo0rIvTUap4zFcbmmAEhU0z1DozHUZumiXb0BztbODi9865u43iNJFLGkZBU/paI1RorXS1tdfsIozZfaBXXdkv/9Dlm6/XyQYoyFHamJisyIpnvlLW0yHul/uIRxoM2z4D+rr2/jD47BQfKWDTT//wJd1ZSe/yY7/ltdIzTILiJL1tIksYdcudXOZSfVyEYNq8vg==;5:hKowhJvcMFV3s5oNcHTh1W1om/KMwW+9DLggparmMKTolDYZ/zdTnKYBGgsUctbRZU2LV1IzF5YUDzLsWg3vX6Uz9jxHmgSsTisHzAwsH0zuU8jkZX5RQqCdlWY7SNvjl0go5n3Yvy0P8Qc3Vo3y/nnFvBT33LuygbndqSSNaNObjtRfstlBGRMS/XxI9+UOOkzFubRBfq3pfRSHEmHCFg==;7:o4QvTn8PWyyxV0VGT0T2RGGe470ym9L62mCOyYz4lyVw4Xf08yyy5D1hrb6jNyl/rTW/CB+Ga/3PSNNkviQkqZPlzMzp9/iYsh8Wn0+1wFGMNmsulVOaMFD91GXRdJ0sbVJ3rYfu8UBEX4TbYtYb7g== x-ms-office365-filtering-correlation-id: ae5cb829-5363-437b-24d3-08d68cef7560 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB2792; x-ms-traffictypediagnostic: BYAPR11MB2792: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(979002)(396003)(136003)(346002)(366004)(376002)(39860400002)(189003)(199004)(2501003)(256004)(14444005)(7736002)(68736007)(107886003)(81166006)(81156014)(305945005)(186003)(8676002)(8936002)(66066001)(50226002)(97736004)(52116002)(4326008)(11346002)(86362001)(30864003)(316002)(25786009)(476003)(2616005)(54906003)(478600001)(6486002)(105586002)(486006)(6916009)(106356001)(6436002)(14454004)(53946003)(6512007)(53936002)(2906002)(2351001)(71200400001)(71190400001)(6116002)(3846002)(386003)(6506007)(446003)(76176011)(36756003)(26005)(5640700003)(102836004)(99286004)(72206003)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB2792;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: q36E0TPvMHr9LTHse4cV9YFPUwxEdJWTC4ytYqb2U49COpo+Wp8hC9YHverIr+0/WY8ypogBfq67oBlg2Lt4GajuWcxjDqCo79oGIq+yNXhyhG35y9d3XK/kOb94akYGImYF78hXZCLwXYZNKSgOIZh0mjhdmNyt8UyvbUtDdbWfORQ+TroMQY3v8napSadIuNe58qeJ/DHHo/hNN+kKIZi+PFjqBkVes3WIC31SX+G3mjtY5tH5N6X47Bl+4msPWujBrnb5FzFNghgctIoLCR7VtGtxug3ESO1XGhN4hRokddwIHfhQujHan+fJ2FlBXFp0fqLTAcKKwcEuvvrtYAHQ0EipN98yo3TiEOiW9jdIY9jhjwCzh0oC1+279A5akDQ8q+55yd03q8x1zwIFpuaM2w8iO0IAl9chEYkRsS0= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: ae5cb829-5363-437b-24d3-08d68cef7560 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 11:28:59.0254 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2792 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Cleanup patch to rename data structure and function name to have 'wilc_' prefix. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/host_interface.c | 54 +++++++++++------------ drivers/staging/wilc1000/host_interface.h | 12 ++--- drivers/staging/wilc1000/wilc_spi.c | 4 +- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 22 ++++----- drivers/staging/wilc1000/wilc_wlan.c | 8 ++-- drivers/staging/wilc1000/wilc_wlan.h | 8 ++-- drivers/staging/wilc1000/wilc_wlan_cfg.c | 12 ++--- drivers/staging/wilc1000/wilc_wlan_if.h | 2 +- 8 files changed, 61 insertions(+), 61 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 0fb6ca3..9abe341 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -9,7 +9,7 @@ #define WILC_HIF_SCAN_TIMEOUT_MS 4000 #define WILC_HIF_CONNECT_TIMEOUT_MS 9500 -#define FALSE_FRMWR_CHANNEL 100 +#define WILC_FALSE_FRMWR_CHANNEL 100 struct wilc_rcvd_mac_info { u8 status; @@ -21,7 +21,7 @@ struct wilc_set_multicast { u8 *mc_list; }; -struct del_all_sta { +struct wilc_del_all_sta { u8 assoc_sta; u8 mac[WILC_MAX_NUM_STA][ETH_ALEN]; }; @@ -68,16 +68,16 @@ struct wilc_gtk_key { u8 key[0]; } __packed; -union message_body { +union wilc_message_body { struct wilc_rcvd_net_info net_info; struct wilc_rcvd_mac_info mac_info; struct wilc_set_multicast mc_info; - struct remain_ch remain_on_ch; + struct wilc_remain_ch remain_on_ch; char *data; }; struct host_if_msg { - union message_body body; + union wilc_message_body body; struct wilc_vif *vif; struct work_struct work; void (*fn)(struct work_struct *ws); @@ -110,7 +110,7 @@ struct wilc_join_bss_param { u8 bssid[ETH_ALEN]; __le16 beacon_period; u8 dtim_period; - u8 supp_rates[MAX_RATES_SUPPORTED + 1]; + u8 supp_rates[WILC_MAX_RATES_SUPPORTED + 1]; u8 wmm_cap; u8 uapsd_cap; u8 ht_capable; @@ -195,7 +195,7 @@ static int handle_scan_done(struct wilc_vif *vif, enum scan_event evt) u8 abort_running_scan; struct wid wid; struct host_if_drv *hif_drv = vif->hif_drv; - struct user_scan_req *scan_req; + struct wilc_user_scan_req *scan_req; if (evt == SCAN_EVENT_ABORTED) { abort_running_scan = 1; @@ -475,8 +475,8 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, supp_rates_ie = cfg80211_find_ie(WLAN_EID_EXT_SUPP_RATES, ies->data, ies->len); if (supp_rates_ie) { - if (supp_rates_ie[1] > (MAX_RATES_SUPPORTED - rates_len)) - param->supp_rates[0] = MAX_RATES_SUPPORTED; + if (supp_rates_ie[1] > (WILC_MAX_RATES_SUPPORTED - rates_len)) + param->supp_rates[0] = WILC_MAX_RATES_SUPPORTED; else param->supp_rates[0] += supp_rates_ie[1]; @@ -563,7 +563,7 @@ static void handle_rcvd_ntwrk_info(struct work_struct *work) { struct host_if_msg *msg = container_of(work, struct host_if_msg, work); struct wilc_rcvd_net_info *rcvd_info = &msg->body.net_info; - struct user_scan_req *scan_req = &msg->vif->hif_drv->usr_scan_req; + struct wilc_user_scan_req *scan_req = &msg->vif->hif_drv->usr_scan_req; const u8 *ch_elm; u8 *ies; int ies_len; @@ -758,7 +758,7 @@ int wilc_disconnect(struct wilc_vif *vif) { struct wid wid; struct host_if_drv *hif_drv = vif->hif_drv; - struct user_scan_req *scan_req; + struct wilc_user_scan_req *scan_req; struct wilc_conn_info *conn_info; int result; u16 dummy_reason_code = 0; @@ -911,7 +911,7 @@ static void wilc_hif_pack_sta_param(u8 *cur_byte, const u8 *mac, } static int handle_remain_on_chan(struct wilc_vif *vif, - struct remain_ch *hif_remain_ch) + struct wilc_remain_ch *hif_remain_ch) { int result; u8 remain_on_chan_flag; @@ -957,7 +957,7 @@ static void handle_listen_state_expired(struct work_struct *work) { struct host_if_msg *msg = container_of(work, struct host_if_msg, work); struct wilc_vif *vif = msg->vif; - struct remain_ch *hif_remain_ch = &msg->body.remain_on_ch; + struct wilc_remain_ch *hif_remain_ch = &msg->body.remain_on_ch; u8 remain_on_chan_flag; struct wid wid; int result; @@ -975,7 +975,7 @@ static void handle_listen_state_expired(struct work_struct *work) goto free_msg; wid.val[0] = remain_on_chan_flag; - wid.val[1] = FALSE_FRMWR_CHANNEL; + wid.val[1] = WILC_FALSE_FRMWR_CHANNEL; result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); @@ -1224,7 +1224,7 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len, u8 mode, u8 cipher_mode, u8 index) { int result = 0; - u8 t_key_len = ptk_key_len + RX_MIC_KEY_LEN + TX_MIC_KEY_LEN; + u8 t_key_len = ptk_key_len + WILC_RX_MIC_KEY_LEN + WILC_TX_MIC_KEY_LEN; if (mode == WILC_AP_MODE) { struct wid wid_list[2]; @@ -1246,11 +1246,11 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len, if (rx_mic) memcpy(&key_buf->key[ptk_key_len], rx_mic, - RX_MIC_KEY_LEN); + WILC_RX_MIC_KEY_LEN); if (tx_mic) - memcpy(&key_buf->key[ptk_key_len + RX_MIC_KEY_LEN], - tx_mic, TX_MIC_KEY_LEN); + memcpy(&key_buf->key[ptk_key_len + WILC_RX_MIC_KEY_LEN], + tx_mic, WILC_TX_MIC_KEY_LEN); wid_list[1].id = WID_ADD_PTK; wid_list[1].type = WID_STR; @@ -1274,11 +1274,11 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len, if (rx_mic) memcpy(&key_buf->key[ptk_key_len], rx_mic, - RX_MIC_KEY_LEN); + WILC_RX_MIC_KEY_LEN); if (tx_mic) - memcpy(&key_buf->key[ptk_key_len + RX_MIC_KEY_LEN], - tx_mic, TX_MIC_KEY_LEN); + memcpy(&key_buf->key[ptk_key_len + WILC_RX_MIC_KEY_LEN], + tx_mic, WILC_TX_MIC_KEY_LEN); wid.id = WID_ADD_PTK; wid.type = WID_STR; @@ -1299,7 +1299,7 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len, { int result = 0; struct wilc_gtk_key *gtk_key; - int t_key_len = gtk_key_len + RX_MIC_KEY_LEN + TX_MIC_KEY_LEN; + int t_key_len = gtk_key_len + WILC_RX_MIC_KEY_LEN + WILC_TX_MIC_KEY_LEN; gtk_key = kzalloc(sizeof(*gtk_key) + t_key_len, GFP_KERNEL); if (!gtk_key) @@ -1317,11 +1317,11 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len, memcpy(>k_key->key[0], rx_gtk, gtk_key_len); if (rx_mic) - memcpy(>k_key->key[gtk_key_len], rx_mic, RX_MIC_KEY_LEN); + memcpy(>k_key->key[gtk_key_len], rx_mic, WILC_RX_MIC_KEY_LEN); if (tx_mic) - memcpy(>k_key->key[gtk_key_len + RX_MIC_KEY_LEN], - tx_mic, TX_MIC_KEY_LEN); + memcpy(>k_key->key[gtk_key_len + WILC_RX_MIC_KEY_LEN], + tx_mic, WILC_TX_MIC_KEY_LEN); if (mode == WILC_AP_MODE) { struct wid wid_list[2]; @@ -1819,7 +1819,7 @@ int wilc_remain_on_channel(struct wilc_vif *vif, u64 cookie, void (*expired)(void *, u64), void *user_arg) { - struct remain_ch roc; + struct wilc_remain_ch roc; int result; roc.ch = chan; @@ -2017,7 +2017,7 @@ int wilc_del_allstation(struct wilc_vif *vif, u8 mac_addr[][ETH_ALEN]) int result; int i; u8 assoc_sta = 0; - struct del_all_sta del_sta; + struct wilc_del_all_sta del_sta; memset(&del_sta, 0x0, sizeof(del_sta)); for (i = 0; i < WILC_MAX_NUM_STA; i++) { diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 790f83e..a007625 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -21,8 +21,8 @@ enum { #define WILC_MAX_NUM_SCANNED_CH 14 #define WILC_MAX_NUM_PROBED_SSID 10 -#define TX_MIC_KEY_LEN 8 -#define RX_MIC_KEY_LEN 8 +#define WILC_TX_MIC_KEY_LEN 8 +#define WILC_RX_MIC_KEY_LEN 8 #define WILC_MAX_NUM_PMKIDS 16 #define WILC_ADD_STA_LENGTH 40 @@ -115,7 +115,7 @@ struct wilc_probe_ssid { u32 size; }; -struct user_scan_req { +struct wilc_user_scan_req { void (*scan_result)(enum scan_event evt, struct wilc_rcvd_net_info *info, void *priv); void *arg; @@ -137,7 +137,7 @@ struct wilc_conn_info { void *param; }; -struct remain_ch { +struct wilc_remain_ch { u16 ch; u32 duration; void (*expired)(void *priv, u64 cookie); @@ -147,9 +147,9 @@ struct remain_ch { struct wilc; struct host_if_drv { - struct user_scan_req usr_scan_req; + struct wilc_user_scan_req usr_scan_req; struct wilc_conn_info conn_info; - struct remain_ch remain_on_ch; + struct wilc_remain_ch remain_on_ch; u64 p2p_timeout; enum host_if_state hif_state; diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c index 153e120..4a1be9e 100644 --- a/drivers/staging/wilc1000/wilc_spi.c +++ b/drivers/staging/wilc1000/wilc_spi.c @@ -814,7 +814,7 @@ static int wilc_spi_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) * ********************************************/ -static int _wilc_spi_deinit(struct wilc *wilc) +static int wilc_spi_deinit(struct wilc *wilc) { /* * TODO: @@ -1122,7 +1122,7 @@ static int wilc_spi_sync_ext(struct wilc *wilc, int nint) /* Global spi HIF function table */ static const struct wilc_hif_func wilc_hif_spi = { .hif_init = wilc_spi_init, - .hif_deinit = _wilc_spi_deinit, + .hif_deinit = wilc_spi_deinit, .hif_read_reg = wilc_spi_read_reg, .hif_write_reg = wilc_spi_write_reg, .hif_block_rx = wilc_spi_read, diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 8fb4bd4..5e7a467 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -27,7 +27,7 @@ #define GAS_INITIAL_REQ 0x0a #define GAS_INITIAL_RSP 0x0b -#define INVALID_CHANNEL 0 +#define WILC_INVALID_CHANNEL 0 static const struct ieee80211_txrx_stypes wilc_wfi_cfg80211_mgmt_types[NUM_NL80211_IFTYPES] = { @@ -62,7 +62,7 @@ static const struct wiphy_wowlan_support wowlan_support = { .flags = WIPHY_WOWLAN_ANY }; -struct p2p_mgmt_data { +struct wilc_p2p_mgmt_data { int size; u8 *buff; }; @@ -158,7 +158,7 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, u8 mac_status, wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE); if (vif->iftype != WILC_CLIENT_MODE) - wl->sta_ch = INVALID_CHANNEL; + wl->sta_ch = WILC_INVALID_CHANNEL; netdev_err(dev, "Unspecified failure\n"); } @@ -184,7 +184,7 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, u8 mac_status, wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE); if (vif->iftype != WILC_CLIENT_MODE) - wl->sta_ch = INVALID_CHANNEL; + wl->sta_ch = WILC_INVALID_CHANNEL; if (wfi_drv->ifc_up && dev == wl->vif[1]->ndev) reason = 3; @@ -446,7 +446,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, netdev_err(dev, "wilc_set_join_req(): Error\n"); ret = -ENOENT; if (vif->iftype != WILC_CLIENT_MODE) - vif->wilc->sta_ch = INVALID_CHANNEL; + vif->wilc->sta_ch = WILC_INVALID_CHANNEL; wilc_wlan_set_bssid(dev, NULL, WILC_STATION_MODE); wfi_drv->conn_info.conn_result = NULL; kfree(join_params); @@ -484,7 +484,7 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, } if (vif->iftype != WILC_CLIENT_MODE) - wilc->sta_ch = INVALID_CHANNEL; + wilc->sta_ch = WILC_INVALID_CHANNEL; wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE); priv->p2p.local_random = 0x01; @@ -974,7 +974,7 @@ static void wilc_wfi_cfg_parse_rx_action(u8 *buf, u32 len, u8 sta_ch) op_channel_attr_index = index; index += buf[index + 1] + 3; } - if (sta_ch != INVALID_CHANNEL) + if (sta_ch != WILC_INVALID_CHANNEL) wilc_wfi_cfg_parse_ch_attr(buf, channel_list_attr_index, op_channel_attr_index, sta_ch); } @@ -999,7 +999,7 @@ static void wilc_wfi_cfg_parse_tx_action(u8 *buf, u32 len, bool oper_ch, op_channel_attr_index = index; index += buf[index + 1] + 3; } - if (sta_ch != INVALID_CHANNEL && oper_ch) + if (sta_ch != WILC_INVALID_CHANNEL && oper_ch) wilc_wfi_cfg_parse_ch_attr(buf, channel_list_attr_index, op_channel_attr_index, sta_ch); } @@ -1115,7 +1115,7 @@ void wilc_wfi_p2p_rx(struct net_device *dev, u8 *buff, u32 size) static void wilc_wfi_mgmt_tx_complete(void *priv, int status) { - struct p2p_mgmt_data *pv_data = priv; + struct wilc_p2p_mgmt_data *pv_data = priv; kfree(pv_data->buff); kfree(pv_data); @@ -1189,7 +1189,7 @@ static int cancel_remain_on_channel(struct wiphy *wiphy, } static void wilc_wfi_cfg_tx_vendor_spec(struct wilc_priv *priv, - struct p2p_mgmt_data *mgmt_tx, + struct wilc_p2p_mgmt_data *mgmt_tx, struct cfg80211_mgmt_tx_params *params, u8 iftype, u32 buf_len) { @@ -1249,7 +1249,7 @@ static int mgmt_tx(struct wiphy *wiphy, const u8 *buf = params->buf; size_t len = params->len; const struct ieee80211_mgmt *mgmt; - struct p2p_mgmt_data *mgmt_tx; + struct wilc_p2p_mgmt_data *mgmt_tx; struct wilc_priv *priv = wiphy_priv(wiphy); struct host_if_drv *wfi_drv = priv->hif_drv; struct wilc_vif *vif = netdev_priv(wdev->netdev); diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 7a757c9..af1c4d8 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -523,7 +523,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) if (vmm_sz & 0x3) vmm_sz = (vmm_sz + 4) & ~0x3; - if ((sum + vmm_sz) > LINUX_TX_SIZE) + if ((sum + vmm_sz) > WILC_TX_BUFF_SIZE) break; vmm_table[i] = vmm_sz / 4; @@ -811,7 +811,7 @@ static void wilc_wlan_handle_isr_ext(struct wilc *wilc, u32 int_status) if (size <= 0) return; - if (LINUX_RX_SIZE - offset < size) + if (WILC_RX_BUFF_SIZE - offset < size) offset = 0; buffer = &wilc->rx_buffer[offset]; @@ -1314,7 +1314,7 @@ int wilc_wlan_init(struct net_device *dev) } if (!wilc->tx_buffer) - wilc->tx_buffer = kmalloc(LINUX_TX_SIZE, GFP_KERNEL); + wilc->tx_buffer = kmalloc(WILC_TX_BUFF_SIZE, GFP_KERNEL); if (!wilc->tx_buffer) { ret = -ENOBUFS; @@ -1322,7 +1322,7 @@ int wilc_wlan_init(struct net_device *dev) } if (!wilc->rx_buffer) - wilc->rx_buffer = kmalloc(LINUX_RX_SIZE, GFP_KERNEL); + wilc->rx_buffer = kmalloc(WILC_RX_BUFF_SIZE, GFP_KERNEL); if (!wilc->rx_buffer) { ret = -ENOBUFS; diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h index 1d61e20..d8fabe8 100644 --- a/drivers/staging/wilc1000/wilc_wlan.h +++ b/drivers/staging/wilc1000/wilc_wlan.h @@ -131,8 +131,8 @@ #define WILC_PLL_TO_SPI 2 #define ABORT_INT BIT(31) -#define LINUX_RX_SIZE (96 * 1024) -#define LINUX_TX_SIZE (64 * 1024) +#define WILC_RX_BUFF_SIZE (96 * 1024) +#define WILC_TX_BUFF_SIZE (64 * 1024) #define MODALIAS "WILC_SPI" #define GPIO_NUM 0x44 @@ -248,7 +248,7 @@ struct wilc_hif_func { void (*disable_interrupt)(struct wilc *nic); }; -#define MAX_CFG_FRAME_SIZE 1468 +#define WILC_MAX_CFG_FRAME_SIZE 1468 struct wilc_cfg_cmd_hdr { u8 cmd_type; @@ -259,7 +259,7 @@ struct wilc_cfg_cmd_hdr { struct wilc_cfg_frame { struct wilc_cfg_cmd_hdr hdr; - u8 frame[MAX_CFG_FRAME_SIZE]; + u8 frame[WILC_MAX_CFG_FRAME_SIZE]; }; struct wilc_cfg_rsp { diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c index 67e9f93..9dc5de4 100644 --- a/drivers/staging/wilc1000/wilc_wlan_cfg.c +++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c @@ -54,7 +54,7 @@ static int wilc_wlan_cfg_set_byte(u8 *frame, u32 offset, u16 id, u8 val8) { u8 *buf; - if ((offset + 4) >= MAX_CFG_FRAME_SIZE) + if ((offset + 4) >= WILC_MAX_CFG_FRAME_SIZE) return 0; buf = &frame[offset]; @@ -71,7 +71,7 @@ static int wilc_wlan_cfg_set_hword(u8 *frame, u32 offset, u16 id, u16 val16) { u8 *buf; - if ((offset + 5) >= MAX_CFG_FRAME_SIZE) + if ((offset + 5) >= WILC_MAX_CFG_FRAME_SIZE) return 0; buf = &frame[offset]; @@ -90,7 +90,7 @@ static int wilc_wlan_cfg_set_word(u8 *frame, u32 offset, u16 id, u32 val32) { u8 *buf; - if ((offset + 7) >= MAX_CFG_FRAME_SIZE) + if ((offset + 7) >= WILC_MAX_CFG_FRAME_SIZE) return 0; buf = &frame[offset]; @@ -112,7 +112,7 @@ static int wilc_wlan_cfg_set_str(u8 *frame, u32 offset, u16 id, u8 *str, { u8 *buf; - if ((offset + size + 4) >= MAX_CFG_FRAME_SIZE) + if ((offset + size + 4) >= WILC_MAX_CFG_FRAME_SIZE) return 0; buf = &frame[offset]; @@ -134,7 +134,7 @@ static int wilc_wlan_cfg_set_bin(u8 *frame, u32 offset, u16 id, u8 *b, u32 size) u32 i; u8 checksum = 0; - if ((offset + size + 5) >= MAX_CFG_FRAME_SIZE) + if ((offset + size + 5) >= WILC_MAX_CFG_FRAME_SIZE) return 0; buf = &frame[offset]; @@ -309,7 +309,7 @@ int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id) { u8 *buf; - if ((offset + 2) >= MAX_CFG_FRAME_SIZE) + if ((offset + 2) >= WILC_MAX_CFG_FRAME_SIZE) return 0; buf = &frame[offset]; diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h index 26aad49..9b8cce8 100644 --- a/drivers/staging/wilc1000/wilc_wlan_if.h +++ b/drivers/staging/wilc1000/wilc_wlan_if.h @@ -45,7 +45,7 @@ struct tx_complete_data { * ********************************************/ #define WILC_MULTICAST_TABLE_SIZE 8 -#define MAX_RATES_SUPPORTED 12 +#define WILC_MAX_RATES_SUPPORTED 12 enum bss_types { WILC_FW_BSS_TYPE_INFRA = 0, From patchwork Thu Feb 7 11:29:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800881 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ECEE96C2 for ; Thu, 7 Feb 2019 11:29:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB4C02A862 for ; Thu, 7 Feb 2019 11:29:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF1C12A874; Thu, 7 Feb 2019 11:29:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 518EE2A867 for ; Thu, 7 Feb 2019 11:29:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727037AbfBGL3H (ORCPT ); Thu, 7 Feb 2019 06:29:07 -0500 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:42837 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726579AbfBGL3H (ORCPT ); Thu, 7 Feb 2019 06:29:07 -0500 X-IronPort-AV: E=Sophos;i="5.56,564,1539673200"; d="scan'208";a="24333090" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 04:29:06 -0700 Received: from NAM05-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.106) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 04:29:06 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cgeGgqSdT1khBY1KKXGd0ooR8KDTF49fMuOi/EyqgH0=; b=nSFfOIYR+TBosda19Ajju0OjJ33iRNTmyHEJ2/aZKFWKIzYZCX2KWatHaBigY2tIpCHVO0s0OCfCRkALB67EEg+hemNmkA50wJkiBzg9hxAwaWmNHRUJFbSL3/C8qrknLMifsCJnq/szZko4ef9b7QbKn7IcFiU4YkzsYuEb1hM= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB2792.namprd11.prod.outlook.com (52.135.228.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 7 Feb 2019 11:29:05 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 11:29:05 +0000 From: To: CC: , , , , Subject: [PATCH v2 3/8] staging: wilc1000: move macro and function prototype from wilc_wlan_if.h file Thread-Topic: [PATCH v2 3/8] staging: wilc1000: move macro and function prototype from wilc_wlan_if.h file Thread-Index: AQHUvthVLu7U4pnwZ0OQawe5Ky0Axg== Date: Thu, 7 Feb 2019 11:29:04 +0000 Message-ID: <1549538913-17463-4-git-send-email-ajay.kathat@microchip.com> References: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0060.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:20::22) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [27.59.126.210] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB2792;6:yGSkJXTK5BrDBOi2iJyh8qKlTVERvNpHP3W4eQFZW4WssM5KpMEC4NlSme38y+jePkMAWIBYVppYr5w5NDDZF7mpEoYz3RGmowRXK8TozTx68S/aJd39/dKi0Zu1I12diTYt27tun0l+zdcSJfug3W9scdaYAr3RAs3ieOwGT9u9afooixAXlqH1t8Mq3qzvRADAdF5ko728uvTIwdQhvjotfHcPImlfz7IrEWYjaNdGnTGJWK/kq3sUJU42E9SlbYDbHkRCB6yVC6zx3DL6BFczdk5xFIQpeSUFIhO2h0wwK6h+E+CgBoN7uWJUclBxeonlqetWEPZnMbgIPJ4VOC1O3HeI2WLkFpJzrdMSEsiZ2yYTXC4/G7v7eyIDzn+pfNvgFBkSKOuzqxfRaYr3fv2f+dquOPf4UEQMZi1dfvRgxiylbkazKScTh3lMIZdzoWVkspQX7jyOMf4VH8bfwA==;5:MMRNTWvmyD/i2FNhE1TpR7kw6SGvAsnpQZoK6eJqD4+jBMg2NIiMKfnikTT48bP8r1q8qGMVishG7/fLKjYGXkvjzEMvXHEe6alaDpatOQYaKTQtMR1jOU/CHBLynfVLfkjmcCADCvizPykywpFW85Q2r6ZM+nFNR9gQtZdGUbLWPV0TLjg1u9O9LCJB7uHTX9HcDWOeuBTNX3SseluVlA==;7:JmmUEkJjSeq+BakaC+2dK3dLXhRLs64PhbQwC9GirnF00hgPQycXDtj/Z/me3tWeSs+9pjyxdpQ1P91cSLNdEKJ02iTQCvuj3N+PWWmbULF4X5E0Qkvn4wLA6OeeFGsmlnZ/16W3Cj1Js6m0JMUggA== x-ms-office365-filtering-correlation-id: 4408ac6d-4787-4516-27bb-08d68cef7753 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB2792; x-ms-traffictypediagnostic: BYAPR11MB2792: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(136003)(346002)(366004)(376002)(39860400002)(189003)(199004)(2501003)(256004)(14444005)(7736002)(68736007)(107886003)(81166006)(81156014)(305945005)(186003)(8676002)(8936002)(66066001)(50226002)(97736004)(52116002)(4326008)(11346002)(86362001)(316002)(25786009)(476003)(2616005)(54906003)(478600001)(6486002)(105586002)(486006)(6916009)(106356001)(6436002)(14454004)(6512007)(53936002)(2906002)(2351001)(71200400001)(71190400001)(6116002)(3846002)(386003)(6506007)(446003)(76176011)(36756003)(26005)(5640700003)(102836004)(99286004)(72206003);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB2792;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: UiM4WKVdq+t2bP4kCTGSsN+LY7SJrHw8onQ20DMz9rtvZ/FNyLUgB45JPtMkENqFLpcqTPdL0g154z+K4Pqwbc9O07AC+hJ+1BYxf6pgnhB0imD5BumXMysY0gd6EICam3ThnSnZmmVhckwiGo2CjUsPTkbEJZW95eF7tnZ9a1uifG6zvXOr6nI2690x99DlRbvugVEIeAgXctXaIEogr4jaHjJQ/nWq/ntw0G65F0rxfCoRAePusLyzBBQfgFGEKAt8M3xduRub7Z+1B/z/r4dKUQhKq/QgZ+ZOlKTbE8X+ZrgZV5g1I47ltdwuFvGZhRyVpnAEJUHR3MlqYXhasMg31S/AuC7l4wtg4+b+L2KmAEk+FN81TAFxEwXEzWRaPqgHHiziw8rcubE4PjJVC+GrFm+2lIVdgDd9wzNf0mg= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 4408ac6d-4787-4516-27bb-08d68cef7753 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 11:29:02.3078 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2792 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Move data structure and function prototype from 'wilc_wlan_if.h file. Now, this file contains constant specific to the firmware. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/host_interface.c | 1 + drivers/staging/wilc1000/host_interface.h | 11 ++++++++++ drivers/staging/wilc1000/linux_wlan.c | 2 ++ drivers/staging/wilc1000/wilc_wlan.h | 9 ++++++++ drivers/staging/wilc1000/wilc_wlan_if.h | 36 ------------------------------- 5 files changed, 23 insertions(+), 36 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 9abe341..50dc2dd 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -10,6 +10,7 @@ #define WILC_HIF_CONNECT_TIMEOUT_MS 9500 #define WILC_FALSE_FRMWR_CHANNEL 100 +#define WILC_MAX_RATES_SUPPORTED 12 struct wilc_rcvd_mac_info { u8 status; diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index a007625..678e623 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -97,6 +97,17 @@ enum conn_event { CONN_DISCONN_EVENT_FORCE_32BIT = 0xFFFFFFFF }; +enum { + WILC_HIF_SDIO = 0, + WILC_HIF_SPI = BIT(0) +}; + +enum { + WILC_MAC_STATUS_INIT = -1, + WILC_MAC_STATUS_DISCONNECTED = 0, + WILC_MAC_STATUS_CONNECTED = 1 +}; + struct wilc_rcvd_net_info { s8 rssi; u8 ch; diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index f3e52af..1ebf2b8 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -12,6 +12,8 @@ #include "wilc_wfi_cfgoperations.h" +#define WILC_MULTICAST_TABLE_SIZE 8 + static irqreturn_t isr_uh_routine(int irq, void *user_data) { struct net_device *dev = user_data; diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h index d8fabe8..1a27f62 100644 --- a/drivers/staging/wilc1000/wilc_wlan.h +++ b/drivers/staging/wilc1000/wilc_wlan.h @@ -250,6 +250,13 @@ struct wilc_hif_func { #define WILC_MAX_CFG_FRAME_SIZE 1468 +struct tx_complete_data { + int size; + void *buff; + u8 *bssid; + struct sk_buff *skb; +}; + struct wilc_cfg_cmd_hdr { u8 cmd_type; u8 seq_no; @@ -301,4 +308,6 @@ void chip_allow_sleep(struct wilc *wilc); void chip_wakeup(struct wilc *wilc); int wilc_send_config_pkt(struct wilc_vif *vif, u8 mode, struct wid *wids, u32 count, u32 drv); +int wilc_wlan_init(struct net_device *dev); +u32 wilc_get_chipid(struct wilc *wilc, bool update); #endif diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h index 9b8cce8..b15de36 100644 --- a/drivers/staging/wilc1000/wilc_wlan_if.h +++ b/drivers/staging/wilc1000/wilc_wlan_if.h @@ -11,41 +11,9 @@ /******************************************** * - * Host Interface Defines - * - ********************************************/ - -enum { - WILC_HIF_SDIO = 0, - WILC_HIF_SPI = BIT(0) -}; - -/******************************************** - * - * Wlan Interface Defines - * - ********************************************/ - -enum { - WILC_MAC_STATUS_INIT = -1, - WILC_MAC_STATUS_DISCONNECTED = 0, - WILC_MAC_STATUS_CONNECTED = 1 -}; - -struct tx_complete_data { - int size; - void *buff; - u8 *bssid; - struct sk_buff *skb; -}; - -/******************************************** - * * Wlan Configuration ID * ********************************************/ -#define WILC_MULTICAST_TABLE_SIZE 8 -#define WILC_MAX_RATES_SUPPORTED 12 enum bss_types { WILC_FW_BSS_TYPE_INFRA = 0, @@ -832,8 +800,4 @@ enum { WID_MAX = 0xFFFF }; -struct wilc; -int wilc_wlan_init(struct net_device *dev); -u32 wilc_get_chipid(struct wilc *wilc, bool update); - #endif From patchwork Thu Feb 7 11:29:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800883 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D322C13B5 for ; Thu, 7 Feb 2019 11:29:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C496E2A862 for ; Thu, 7 Feb 2019 11:29:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8DB62A874; Thu, 7 Feb 2019 11:29:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 451592A862 for ; Thu, 7 Feb 2019 11:29:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727073AbfBGL3K (ORCPT ); Thu, 7 Feb 2019 06:29:10 -0500 Received: from esa6.microchip.iphmx.com ([216.71.154.253]:24901 "EHLO esa6.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726579AbfBGL3K (ORCPT ); Thu, 7 Feb 2019 06:29:10 -0500 X-IronPort-AV: E=Sophos;i="5.58,343,1544511600"; d="scan'208";a="23538665" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 04:29:09 -0700 Received: from NAM05-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.108) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 04:29:09 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z+vHQ1mj2EjPsMFWZFfPFFsz1Y8ZB6ftnSsUBCBYybo=; b=G18lvhJsQXVZW/K+hYjPp68UTSaezot6yT4NrPUgtKLzOfNt6LR/0g4PMWT7oUeBqnffI2NX3iCmq+e91xleIOxheWEZm3PM8k/437xMsEhY3Q6xTlZIsNPpsi/FSWsfj/8STE0TSvD++hUyM322AMOunW4qcRi+kLlJFKakUQk= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB2792.namprd11.prod.outlook.com (52.135.228.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 7 Feb 2019 11:29:08 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 11:29:08 +0000 From: To: CC: , , , , Subject: [PATCH v2 4/8] staging: wilc1000: avoid function forward declaration in wilc_sdio.c file Thread-Topic: [PATCH v2 4/8] staging: wilc1000: avoid function forward declaration in wilc_sdio.c file Thread-Index: AQHUvthWQawKIMjv30morbkucThMRg== Date: Thu, 7 Feb 2019 11:29:07 +0000 Message-ID: <1549538913-17463-5-git-send-email-ajay.kathat@microchip.com> References: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0060.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:20::22) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [27.59.126.210] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB2792;6:QeB46xcIN+0oMexgqebtosfOIa87kAgpLX160m397+GkYsWYyXC0TL/Vs+O2DU/MEm53ZcnC+N9/tZuTc96A83VMoRwhG+cV7xdptWASP3gPZ76OruxqLdavju+ZZ8bO+uzPpi8YXsFCcIAahEVfOEHc6U5E4ajQgZ4YvEZF0sKiTttWTtZ1GwHiGgNJU/B+Mh9gV5ziWUHEZmPKBxKi/qB3YHHoFs1YRQneNcZmWzTv8EFDTUXBewzrikQ0lmEp7RzHQj5GNy4XcOoKejPP3hzxm5hkh1vHJa6dUAU2xH71QqAon50+5an/OzWuonvbGG3YYmWH1A0KQ1QLM+c74Jg4+ZOAlYywutBUHQA3nlUPm6gNk9qC5TtUyo/gEevYswbTqHruz0zrwKfKiuDtQGzF74cz1V/EKCQfq+Yqu4yzx6j/sKwO4sbGhCGn3qwoILv5HiNui0SbBrpQ0H8XrQ==;5:v3HJAcUXVBJmZW6NCnrzKBniPtbGpgybcCSPEvQZfq4K7uE2vr29Vps5E0P+97bOsAj0AqYQQ/6qselxVHEtZfjKn+QQ4DUH5GM/+PWg8eCMxWVNyBCnBsYOhV0VCAbOfznl6ql6sllHml/XvuTOwLaJnWAiUCcfTzw9j2H2fAhBpKsWp+XyjtPTbG7hJpi2Dd8ROgh0Y6BGFzhPd5oFOQ==;7:Rg/95th2RcZU6PUTzEfbcUr7DhKjoryRsz/ouG5oDoGztFrXedfPPkcRlfG159Nww6KM/IJNGDjmP/5BSlfX52bpQWxLuhtpg01YuOxhSx2bBO6onBhkDxiNWrMq3W5fn+UOFdgGB6jcam0niGsHRg== x-ms-office365-filtering-correlation-id: 3075790e-a5bf-48b7-ad98-08d68cef7916 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB2792; x-ms-traffictypediagnostic: BYAPR11MB2792: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(136003)(346002)(366004)(376002)(39860400002)(189003)(199004)(2501003)(256004)(14444005)(7736002)(68736007)(107886003)(81166006)(81156014)(305945005)(186003)(8676002)(8936002)(66066001)(50226002)(97736004)(52116002)(4326008)(11346002)(86362001)(316002)(25786009)(476003)(2616005)(54906003)(478600001)(6486002)(105586002)(486006)(6916009)(106356001)(6436002)(14454004)(6512007)(53936002)(2906002)(2351001)(71200400001)(71190400001)(6116002)(3846002)(386003)(6506007)(446003)(76176011)(36756003)(26005)(5640700003)(102836004)(99286004)(72206003);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB2792;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: aqMk7pu9s2gsELHu73FQfle8wAg8Qe8oSO/VKoDh/RSU2yyzzopFDxg7mwVtj4RxIsv8+cGRj66aXYeu3B3AYbuIRgd7E2vER1596y22zKDeiSuqek1wzbNzSw1RpgpNbmsHejBg1pOB6x0QA6uqeXf9g8koP/e0qZ75tHz1IyvmKl3yeH12vhEljWMR0/oG/2ly+5hRUENlS0Ri/bdTMQ5vJ4kdF+krQdNq7i9EEerHXSW7JuF6Y3OuAoJBl5WptWsYN3VqTmiczjAGgaDZEra7dDqGac6FvUetNFVBTWVG1LXQn5nWV1tTFh6/xxhf6ulYVnUotnVbaeciqnmT0yI4wJ1eeCviF4x5DD1UhxmuDDYheV7njc0j01SgibG6dR5J1HWV+tH8SKWYzLXPhgCKSPdBlasWdGhMpPcWypE= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 3075790e-a5bf-48b7-ad98-08d68cef7916 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 11:29:05.3489 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2792 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Cleanup patch to avoid function forward declaration by reordering the function. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/wilc_sdio.c | 91 +++++++++++++++++------------------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c index e2f739f..a62eabe 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/wilc_sdio.c @@ -51,10 +51,6 @@ struct sdio_cmd53 { static const struct wilc_hif_func wilc_hif_sdio; -static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data); -static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data); -static int sdio_init(struct wilc *wilc, bool resume); - static void wilc_sdio_interrupt(struct sdio_func *func) { sdio_release_host(func); @@ -215,50 +211,6 @@ static int wilc_sdio_suspend(struct device *dev) return 0; } -static int wilc_sdio_resume(struct device *dev) -{ - struct sdio_func *func = dev_to_sdio_func(dev); - struct wilc *wilc = sdio_get_drvdata(func); - - dev_info(dev, "sdio resume\n"); - sdio_release_host(func); - chip_wakeup(wilc); - sdio_init(wilc, true); - - if (wilc->suspend_event) - host_wakeup_notify(wilc); - - chip_allow_sleep(wilc); - - return 0; -} - -static const struct of_device_id wilc_of_match[] = { - { .compatible = "microchip,wilc1000-sdio", }, - { /* sentinel */ } -}; -MODULE_DEVICE_TABLE(of, wilc_of_match); - -static const struct dev_pm_ops wilc_sdio_pm_ops = { - .suspend = wilc_sdio_suspend, - .resume = wilc_sdio_resume, -}; - -static struct sdio_driver wilc_sdio_driver = { - .name = SDIO_MODALIAS, - .id_table = wilc_sdio_ids, - .probe = linux_sdio_probe, - .remove = linux_sdio_remove, - .drv = { - .pm = &wilc_sdio_pm_ops, - .of_match_table = wilc_of_match, - } -}; -module_driver(wilc_sdio_driver, - sdio_register_driver, - sdio_unregister_driver); -MODULE_LICENSE("GPL"); - static int wilc_sdio_enable_interrupt(struct wilc *dev) { struct sdio_func *func = container_of(dev->dev, struct sdio_func, dev); @@ -1143,3 +1095,46 @@ static const struct wilc_hif_func wilc_hif_sdio = { .disable_interrupt = wilc_sdio_disable_interrupt, }; +static int wilc_sdio_resume(struct device *dev) +{ + struct sdio_func *func = dev_to_sdio_func(dev); + struct wilc *wilc = sdio_get_drvdata(func); + + dev_info(dev, "sdio resume\n"); + sdio_release_host(func); + chip_wakeup(wilc); + sdio_init(wilc, true); + + if (wilc->suspend_event) + host_wakeup_notify(wilc); + + chip_allow_sleep(wilc); + + return 0; +} + +static const struct of_device_id wilc_of_match[] = { + { .compatible = "microchip,wilc1000-sdio", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, wilc_of_match); + +static const struct dev_pm_ops wilc_sdio_pm_ops = { + .suspend = wilc_sdio_suspend, + .resume = wilc_sdio_resume, +}; + +static struct sdio_driver wilc_sdio_driver = { + .name = SDIO_MODALIAS, + .id_table = wilc_sdio_ids, + .probe = linux_sdio_probe, + .remove = linux_sdio_remove, + .drv = { + .pm = &wilc_sdio_pm_ops, + .of_match_table = wilc_of_match, + } +}; +module_driver(wilc_sdio_driver, + sdio_register_driver, + sdio_unregister_driver); +MODULE_LICENSE("GPL"); From patchwork Thu Feb 7 11:29:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800885 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F107013B5 for ; Thu, 7 Feb 2019 11:29:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E212E2A862 for ; Thu, 7 Feb 2019 11:29:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6A252A874; Thu, 7 Feb 2019 11:29:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F282B2A862 for ; Thu, 7 Feb 2019 11:29:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727138AbfBGL3O (ORCPT ); Thu, 7 Feb 2019 06:29:14 -0500 Received: from esa3.microchip.iphmx.com ([68.232.153.233]:51239 "EHLO esa3.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726579AbfBGL3O (ORCPT ); Thu, 7 Feb 2019 06:29:14 -0500 X-IronPort-AV: E=Sophos;i="5.56,564,1539673200"; d="scan'208";a="26413611" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 04:29:12 -0700 Received: from NAM05-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.105) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 04:29:12 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+rfhB4kj57y6C8d1chqVEqkYHtwJIk8ZLET+5Gscvm8=; b=MdWYfU5JV63inavGa0v+qZE+E8V7MqphNfpU7u3sFYEB2NQhB6GVPVpX53KgXu95pNCu8hSItJev8Y1Oa2hqbYe/DoRck8HfITZSfNj75igRIWjGICEaXaTPlrchRB6EFKe+oC+sDDHXX0ETIz1dajJ2BOJBRjeI9liZgqJYYqk= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB2792.namprd11.prod.outlook.com (52.135.228.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 7 Feb 2019 11:29:10 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 11:29:10 +0000 From: To: CC: , , , , Subject: [PATCH v2 5/8] staging: wilc1000: added 'wilc_' prefix for function in wilc_sdio.c file Thread-Topic: [PATCH v2 5/8] staging: wilc1000: added 'wilc_' prefix for function in wilc_sdio.c file Thread-Index: AQHUvthYGgexfJLEKkijHZV9zcB1sw== Date: Thu, 7 Feb 2019 11:29:10 +0000 Message-ID: <1549538913-17463-6-git-send-email-ajay.kathat@microchip.com> References: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0060.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:20::22) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [27.59.126.210] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB2792;6:9wBsWK2PFteu+03oetFxmipPQK7A6mePG+437wWw1oQ89FtS78reLb/wuaHXwfMrOrTLtC/wgW71yJZsgUtBAyGNScsKJvkla6e1xa93E1n/sl+jo481Yhe7OGHfU6PMeaHCVq0Kmhu6o95XIwN1ZlnSf7o5gcyg1R4Vi8/D1ptihiYexGz8bzc4CBEPuA8FDD0a+z4SmmlNhalJ2LF7XIknbQC0zp/nuJG97+X7OMOWH1/CtxTPsJjrvPV75zSlh6I41C5E5SXTyYAEBe981lZ+4qGjtT4qE3G128ho848e3phPlA2eXDfN2+gWwml88VEp8VYh7x1xaJxsLAVDLIU49MfiC87/QemeADaK2xE9aAN2+ooJCcWE9iemf5C1jSWqj6ylnONe4AEQy6MC3Xn71tbMOvfW6WyvSSKmBMuIdRUgATYe6XInkodeafGLGQ8W3aMxdJOVAgaZkJq0eg==;5:9Gh5X5epT4o+v4w/Xko281UAxmocn9v+ojmk1jmOlhSubTbrhd/tF3VOuQyK/4riie4gvi+FarbrZWFUoDPl+s6mMDIbEl/34gOYjB1LX4o4eYwjkedaYr0DiFMQLhOZ0yRMVfEi3AWIpvWKmvGhIg2cy/HW5znN6XWIoquhiEbsX4JE0r7k9H1CToWeGbwWDnNBMjmVSbVZlHKtSVXzTw==;7:j2lDuKmJpVjIeo+QaiiyKg/bPBZMuC24uJuU0dP4L7+xQecjP+y1XTCA3ZEM6RF5syR3dE8xbS9t8x/uw1umBwNno50QIFsX4Us8m4P07soAinXOhzypKHYWLVksnjyJI8rrh6gyyYmLYPMa5nzHug== x-ms-office365-filtering-correlation-id: fc32a368-05bd-4c2f-8e8c-08d68cef7ac9 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB2792; x-ms-traffictypediagnostic: BYAPR11MB2792: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(136003)(346002)(366004)(376002)(39860400002)(189003)(199004)(2501003)(256004)(14444005)(7736002)(68736007)(107886003)(81166006)(81156014)(305945005)(186003)(8676002)(8936002)(66066001)(50226002)(97736004)(52116002)(4326008)(11346002)(86362001)(30864003)(316002)(25786009)(476003)(2616005)(54906003)(478600001)(6486002)(105586002)(486006)(6916009)(106356001)(6436002)(14454004)(6512007)(53936002)(2906002)(2351001)(71200400001)(71190400001)(6116002)(3846002)(386003)(6506007)(446003)(76176011)(36756003)(26005)(5640700003)(102836004)(99286004)(72206003);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB2792;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: qSZHc770lhPgdZWQwNvPbDixWtDNch2c7tg8YlnujMY7EyJ3RTpIpnP7Tlt5Y7yHuFeDQdUwu5uaYJnLpvtEkyvAT1mqSk1Y4QNXf9P5jCScR1TZrprUvqJwz/KBZHBcSvzFKICYVrSoj6IfCgWPHLBSqT1Gb5HZLeVYTvm7IrtzcCYQXeNVfCdq0hOs6bI1hEyUvK5HxwWYrW+wlJWQGQgXAD0SfwFpoyLbKZwCk4AZsbE818TcZq9fQnuKiuMWvOzyLxDMHhRklSEUtKc6/EGN7IpUposG7ZrW8KJdQ319j1vkgAC16W2uph2YiD0botfz5qBVf7PcEzJQoljsbBSCU7o/9lKoeCKpjeXeKKUyDFFzqCWlQRXmSt0FIIEHqAuNo0ldHWTo9ieV6d2WSJWVe1xDB3caXEI/gZho2po= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: fc32a368-05bd-4c2f-8e8c-08d68cef7ac9 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 11:29:08.2600 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2792 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Cleanup patch to have proper follow clear namespace in wilc_sdio.c file. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/wilc_sdio.c | 92 ++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c index a62eabe..2ca6757 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/wilc_sdio.c @@ -166,7 +166,7 @@ static void linux_sdio_remove(struct sdio_func *func) wilc_netdev_cleanup(wilc); } -static int sdio_reset(struct wilc *wilc) +static int wilc_sdio_reset(struct wilc *wilc) { struct sdio_cmd52 cmd; int ret; @@ -201,7 +201,7 @@ static int wilc_sdio_suspend(struct device *dev) chip_allow_sleep(wilc); } - ret = sdio_reset(wilc); + ret = wilc_sdio_reset(wilc); if (ret) { dev_err(&func->dev, "Fail reset sdio\n"); return ret; @@ -245,7 +245,7 @@ static void wilc_sdio_disable_interrupt(struct wilc *dev) * ********************************************/ -static int sdio_set_func0_csa_address(struct wilc *wilc, u32 adr) +static int wilc_sdio_set_func0_csa_address(struct wilc *wilc, u32 adr) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_cmd52 cmd; @@ -286,7 +286,7 @@ static int sdio_set_func0_csa_address(struct wilc *wilc, u32 adr) return 0; } -static int sdio_set_func0_block_size(struct wilc *wilc, u32 block_size) +static int wilc_sdio_set_func0_block_size(struct wilc *wilc, u32 block_size) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_cmd52 cmd; @@ -322,7 +322,7 @@ static int sdio_set_func0_block_size(struct wilc *wilc, u32 block_size) * ********************************************/ -static int sdio_set_func1_block_size(struct wilc *wilc, u32 block_size) +static int wilc_sdio_set_func1_block_size(struct wilc *wilc, u32 block_size) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_cmd52 cmd; @@ -356,7 +356,7 @@ static int sdio_set_func1_block_size(struct wilc *wilc, u32 block_size) * Sdio interfaces * ********************************************/ -static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) +static int wilc_sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -384,7 +384,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) /** * set the AHB address **/ - if (!sdio_set_func0_csa_address(wilc, addr)) + if (!wilc_sdio_set_func0_csa_address(wilc, addr)) goto fail; cmd.read_write = 1; @@ -410,7 +410,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) return 0; } -static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) +static int wilc_sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -459,7 +459,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) cmd.buffer = buf; cmd.block_size = block_size; if (addr > 0) { - if (!sdio_set_func0_csa_address(wilc, addr)) + if (!wilc_sdio_set_func0_csa_address(wilc, addr)) goto fail; } ret = wilc_sdio_cmd53(wilc, &cmd); @@ -482,7 +482,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) cmd.block_size = block_size; if (addr > 0) { - if (!sdio_set_func0_csa_address(wilc, addr)) + if (!wilc_sdio_set_func0_csa_address(wilc, addr)) goto fail; } ret = wilc_sdio_cmd53(wilc, &cmd); @@ -500,7 +500,7 @@ static int sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) return 0; } -static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) +static int wilc_sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -523,7 +523,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) } else { struct sdio_cmd53 cmd; - if (!sdio_set_func0_csa_address(wilc, addr)) + if (!wilc_sdio_set_func0_csa_address(wilc, addr)) goto fail; cmd.read_write = 0; @@ -552,7 +552,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) return 0; } -static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) +static int wilc_sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -601,7 +601,7 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) cmd.buffer = buf; cmd.block_size = block_size; if (addr > 0) { - if (!sdio_set_func0_csa_address(wilc, addr)) + if (!wilc_sdio_set_func0_csa_address(wilc, addr)) goto fail; } ret = wilc_sdio_cmd53(wilc, &cmd); @@ -624,7 +624,7 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) cmd.block_size = block_size; if (addr > 0) { - if (!sdio_set_func0_csa_address(wilc, addr)) + if (!wilc_sdio_set_func0_csa_address(wilc, addr)) goto fail; } ret = wilc_sdio_cmd53(wilc, &cmd); @@ -648,12 +648,12 @@ static int sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) * ********************************************/ -static int sdio_deinit(struct wilc *wilc) +static int wilc_sdio_deinit(struct wilc *wilc) { return 1; } -static int sdio_init(struct wilc *wilc, bool resume) +static int wilc_sdio_init(struct wilc *wilc, bool resume) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -681,7 +681,7 @@ static int sdio_init(struct wilc *wilc, bool resume) /** * function 0 block size **/ - if (!sdio_set_func0_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) { + if (!wilc_sdio_set_func0_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) { dev_err(&func->dev, "Fail cmd 52, set func 0 block size...\n"); goto fail; } @@ -730,7 +730,7 @@ static int sdio_init(struct wilc *wilc, bool resume) /** * func 1 is ready, set func 1 block size **/ - if (!sdio_set_func1_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) { + if (!wilc_sdio_set_func1_block_size(wilc, WILC_SDIO_BLOCK_SIZE)) { dev_err(&func->dev, "Fail set func 1 block size...\n"); goto fail; } @@ -753,7 +753,7 @@ static int sdio_init(struct wilc *wilc, bool resume) * make sure can read back chip id correctly **/ if (!resume) { - if (!sdio_read_reg(wilc, 0x1000, &chipid)) { + if (!wilc_sdio_read_reg(wilc, 0x1000, &chipid)) { dev_err(&func->dev, "Fail cmd read chip id...\n"); goto fail; } @@ -773,7 +773,7 @@ static int sdio_init(struct wilc *wilc, bool resume) return 0; } -static int sdio_read_size(struct wilc *wilc, u32 *size) +static int wilc_sdio_read_size(struct wilc *wilc, u32 *size) { u32 tmp; struct sdio_cmd52 cmd; @@ -798,14 +798,14 @@ static int sdio_read_size(struct wilc *wilc, u32 *size) return 1; } -static int sdio_read_int(struct wilc *wilc, u32 *int_status) +static int wilc_sdio_read_int(struct wilc *wilc, u32 *int_status) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; u32 tmp; struct sdio_cmd52 cmd; - sdio_read_size(wilc, &tmp); + wilc_sdio_read_size(wilc, &tmp); /** * Read IRQ flags @@ -857,7 +857,7 @@ static int sdio_read_int(struct wilc *wilc, u32 *int_status) return 1; } -static int sdio_clear_int_ext(struct wilc *wilc, u32 val) +static int wilc_sdio_clear_int_ext(struct wilc *wilc, u32 val) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -982,7 +982,7 @@ static int sdio_clear_int_ext(struct wilc *wilc, u32 val) return 0; } -static int sdio_sync_ext(struct wilc *wilc, int nint) +static int wilc_sdio_sync_ext(struct wilc *wilc, int nint) { struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct wilc_sdio *sdio_priv = wilc->bus_data; @@ -1003,13 +1003,13 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) /** * Disable power sequencer **/ - if (!sdio_read_reg(wilc, WILC_MISC, ®)) { + if (!wilc_sdio_read_reg(wilc, WILC_MISC, ®)) { dev_err(&func->dev, "Failed read misc reg...\n"); return 0; } reg &= ~BIT(8); - if (!sdio_write_reg(wilc, WILC_MISC, reg)) { + if (!wilc_sdio_write_reg(wilc, WILC_MISC, reg)) { dev_err(&func->dev, "Failed write misc reg...\n"); return 0; } @@ -1021,14 +1021,14 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) /** * interrupt pin mux select **/ - ret = sdio_read_reg(wilc, WILC_PIN_MUX_0, ®); + ret = wilc_sdio_read_reg(wilc, WILC_PIN_MUX_0, ®); if (!ret) { dev_err(&func->dev, "Failed read reg (%08x)...\n", WILC_PIN_MUX_0); return 0; } reg |= BIT(8); - ret = sdio_write_reg(wilc, WILC_PIN_MUX_0, reg); + ret = wilc_sdio_write_reg(wilc, WILC_PIN_MUX_0, reg); if (!ret) { dev_err(&func->dev, "Failed write reg (%08x)...\n", WILC_PIN_MUX_0); @@ -1038,7 +1038,7 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) /** * interrupt enable **/ - ret = sdio_read_reg(wilc, WILC_INTR_ENABLE, ®); + ret = wilc_sdio_read_reg(wilc, WILC_INTR_ENABLE, ®); if (!ret) { dev_err(&func->dev, "Failed read reg (%08x)...\n", WILC_INTR_ENABLE); @@ -1047,14 +1047,14 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) for (i = 0; (i < 5) && (nint > 0); i++, nint--) reg |= BIT((27 + i)); - ret = sdio_write_reg(wilc, WILC_INTR_ENABLE, reg); + ret = wilc_sdio_write_reg(wilc, WILC_INTR_ENABLE, reg); if (!ret) { dev_err(&func->dev, "Failed write reg (%08x)...\n", WILC_INTR_ENABLE); return 0; } if (nint) { - ret = sdio_read_reg(wilc, WILC_INTR2_ENABLE, ®); + ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, ®); if (!ret) { dev_err(&func->dev, "Failed read reg (%08x)...\n", @@ -1065,7 +1065,7 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) for (i = 0; (i < 3) && (nint > 0); i++, nint--) reg |= BIT(i); - ret = sdio_read_reg(wilc, WILC_INTR2_ENABLE, ®); + ret = wilc_sdio_read_reg(wilc, WILC_INTR2_ENABLE, ®); if (!ret) { dev_err(&func->dev, "Failed write reg (%08x)...\n", @@ -1079,18 +1079,18 @@ static int sdio_sync_ext(struct wilc *wilc, int nint) /* Global sdio HIF function table */ static const struct wilc_hif_func wilc_hif_sdio = { - .hif_init = sdio_init, - .hif_deinit = sdio_deinit, - .hif_read_reg = sdio_read_reg, - .hif_write_reg = sdio_write_reg, - .hif_block_rx = sdio_read, - .hif_block_tx = sdio_write, - .hif_read_int = sdio_read_int, - .hif_clear_int_ext = sdio_clear_int_ext, - .hif_read_size = sdio_read_size, - .hif_block_tx_ext = sdio_write, - .hif_block_rx_ext = sdio_read, - .hif_sync_ext = sdio_sync_ext, + .hif_init = wilc_sdio_init, + .hif_deinit = wilc_sdio_deinit, + .hif_read_reg = wilc_sdio_read_reg, + .hif_write_reg = wilc_sdio_write_reg, + .hif_block_rx = wilc_sdio_read, + .hif_block_tx = wilc_sdio_write, + .hif_read_int = wilc_sdio_read_int, + .hif_clear_int_ext = wilc_sdio_clear_int_ext, + .hif_read_size = wilc_sdio_read_size, + .hif_block_tx_ext = wilc_sdio_write, + .hif_block_rx_ext = wilc_sdio_read, + .hif_sync_ext = wilc_sdio_sync_ext, .enable_interrupt = wilc_sdio_enable_interrupt, .disable_interrupt = wilc_sdio_disable_interrupt, }; @@ -1103,7 +1103,7 @@ static int wilc_sdio_resume(struct device *dev) dev_info(dev, "sdio resume\n"); sdio_release_host(func); chip_wakeup(wilc); - sdio_init(wilc, true); + wilc_sdio_init(wilc, true); if (wilc->suspend_event) host_wakeup_notify(wilc); From patchwork Thu Feb 7 11:29:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800887 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE7F06C2 for ; Thu, 7 Feb 2019 11:29:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCEC22A862 for ; Thu, 7 Feb 2019 11:29:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D18412A874; Thu, 7 Feb 2019 11:29:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75F462A862 for ; Thu, 7 Feb 2019 11:29:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727187AbfBGL3Q (ORCPT ); Thu, 7 Feb 2019 06:29:16 -0500 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:42850 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726579AbfBGL3Q (ORCPT ); Thu, 7 Feb 2019 06:29:16 -0500 X-IronPort-AV: E=Sophos;i="5.56,564,1539673200"; d="scan'208";a="24333100" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 04:29:15 -0700 Received: from NAM05-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.38) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 04:29:15 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=98kKb+2IOwm90KtFhwshOoR1ugCm5DzbEeOOCSGawd8=; b=l0j2lrR7KgCy7wX6kBFrLAxdR8b8KC0ueyUxGuUMa0mpO318msKKLl3Zne7CnIlnpxU15uacAVwklGBHehVNFeJ7tJYqc7fG24NThK09VSkbU8sFPcUaXOaFHDymWh/qSHzADduNOEeifNprYKM6MTgAq0HF1MUOG/y1OTbn/ZE= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB2792.namprd11.prod.outlook.com (52.135.228.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 7 Feb 2019 11:29:14 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 11:29:14 +0000 From: To: CC: , , , , Subject: [PATCH v2 6/8] staging: wilc1000: rename wilc_frmw_to_linux() Thread-Topic: [PATCH v2 6/8] staging: wilc1000: rename wilc_frmw_to_linux() Thread-Index: AQHUvtha4pLUB6XpJ06E/z7QA1/Eeg== Date: Thu, 7 Feb 2019 11:29:13 +0000 Message-ID: <1549538913-17463-7-git-send-email-ajay.kathat@microchip.com> References: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0060.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:20::22) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [27.59.126.210] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB2792;6:Lb3a/Tb9zIyfR7eb+FzqguJyoPpfRZs+mrZEbSuxBR+LpAWRC8QGcFPyxxF8YpeEXpP/PVS1fMAq5MHpGy784cnChhFEpt0NEapsCDuWFnVqySTGk6USZzEJsaMuuNZ7WWWR0T2QKEN+y579TWD7gAcMmdRMCpEHOPt5cMbbt+Eg+2qyLzGXZIw7w7CQZwHyWfG2oPxLghevfwscb/M8vBaPF95ymWolMqjLmSDdivnDj9OKTjUEe6+97Ge6M9CSDrgXDeFp/aFpVdi2oEiqMX1XiseOciWyegnuI/93/LKMK+9PueSN09oXGoHoRsguEnywhCbJ0xoCjFmMqiPbLkrIRWChcoGVCQREP6hoHx2yU3lRGRHLv4czJahR0aPI9Y35O7StSkyGweeT9pDseyxaLRM9IcVcIsFphKbiB1DYwS9MNeaiJIJFUHCSLZQseB1mmlJjpjwxuIdQfiluNA==;5:Xh/pO9fXV7JTiOMvbfJqns7oyia7YoWzfwYtCfIYHGII7bnDwDFW+s3lurwsA1rPiLmAmO4mjs8KpLeaJFFuRdO1ddpnHxKzwfCwynJKtxC39K0TUSArsHweP9AnNsB+csK/42JJX2kAzgPT1egk2MuoekViP91kEGAW0xLPsGYpuRw0BKlYxFbW4xmt/8ihI/dCWYZRtVUoLJ34jjjGXA==;7:+UAd8Vz9QYqK5+0y6EeK65ACYTb7/FWPfp2OJN4+IIJOvpl6nmyqCZCW6sGXDYsPyJp6GyQ/JkRPC3lcGhw5a2YgjOYYFXKZtfgCApdcW9LYQCUpgjEvCLQiXxSnmYJieP6V8Nn/3h5pUCpU0yODcw== x-ms-office365-filtering-correlation-id: 3f6efb14-4709-4bf2-759d-08d68cef7cb6 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB2792; x-ms-traffictypediagnostic: BYAPR11MB2792: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(136003)(346002)(366004)(376002)(39860400002)(189003)(199004)(2501003)(256004)(14444005)(7736002)(68736007)(107886003)(81166006)(81156014)(305945005)(186003)(8676002)(8936002)(66066001)(50226002)(97736004)(52116002)(4326008)(11346002)(86362001)(316002)(25786009)(476003)(2616005)(54906003)(478600001)(6486002)(105586002)(486006)(6916009)(106356001)(6436002)(14454004)(6512007)(53936002)(2906002)(2351001)(71200400001)(71190400001)(6116002)(3846002)(386003)(6506007)(446003)(76176011)(36756003)(26005)(5640700003)(102836004)(99286004)(72206003);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB2792;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: NnRIa4u2wKk8kSrtlEXxwNOQSO8GWBRp6jpujP1GZyAzKiFNxnkhPfT4NDsrUYVlL2YyHgVo7jpx4TKBgULbyBazxjD7Mc8qP50BwOa3PQuWia72ChMKZAu0d5QzzgVxiN1ECvWjTqFgJ6LONGz+cngnJPEo+YvPY3/XEC7DjQxTyDE3LFMILR0Yl6eczaGVURKYQ72PoYZTsLsvAmY4pxwmhRK68WF41JzPH0kM120SFI43SVNrJDqdT3c1BciTKc8Iusl4ZDtHuN8GYE0/kxtowV8ORDmyAiFZ4U2TM6dJs2W5ST2+XG0rsKf+aS30p78yAtZMiSLX8YPl1dzre/99axfLcHXUwpME7CoUJZZn2XfiuH676kZFixm6H8QhWRKrJqOriy5znw2OTKA3eE125HcT2ItfOADpCnL1Wnw= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 3f6efb14-4709-4bf2-759d-08d68cef7cb6 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 11:29:11.1280 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2792 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Rename wilc_frmw_to_linux() to wilc_frmw_to_host() to be remove the _linux suffix. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/linux_wlan.c | 3 ++- drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 +- drivers/staging/wilc1000/wilc_wlan.c | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 1ebf2b8..1e2f6f4 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -803,7 +803,8 @@ static int wilc_mac_close(struct net_device *ndev) return 0; } -void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset) +void wilc_frmw_to_host(struct wilc *wilc, u8 *buff, u32 size, + u32 pkt_offset) { unsigned int frame_len = 0; int stats; diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index 2b9b8b5..df00762 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -281,7 +281,7 @@ struct wilc_wfi_mon_priv { struct net_device *real_ndev; }; -void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset); +void wilc_frmw_to_host(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset); void wilc_mac_indicate(struct wilc *wilc); void wilc_netdev_cleanup(struct wilc *wilc); int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index af1c4d8..c238969 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -717,9 +717,8 @@ static void wilc_wlan_handle_rx_buff(struct wilc *wilc, u8 *buffer, int size) } else { if (!is_cfg_packet) { if (pkt_len > 0) { - wilc_frmw_to_linux(wilc, buff_ptr, - pkt_len, - pkt_offset); + wilc_frmw_to_host(wilc, buff_ptr, + pkt_len, pkt_offset); } } else { struct wilc_cfg_rsp rsp; From patchwork Thu Feb 7 11:29:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800889 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 00DA113B5 for ; Thu, 7 Feb 2019 11:29:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E39052A889 for ; Thu, 7 Feb 2019 11:29:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7BA82A8D5; Thu, 7 Feb 2019 11:29:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 581FD2A889 for ; Thu, 7 Feb 2019 11:29:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727099AbfBGL3W (ORCPT ); Thu, 7 Feb 2019 06:29:22 -0500 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:21405 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726549AbfBGL3W (ORCPT ); Thu, 7 Feb 2019 06:29:22 -0500 X-IronPort-AV: E=Sophos;i="5.56,564,1539673200"; d="scan'208";a="27383688" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 04:29:18 -0700 Received: from NAM05-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.38) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 04:29:18 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=afOrfstXAiQi11aSr3LL7QeJgSTXfe4qk+yBMFZ4GH4=; b=g6cXYr1B31ruqR8szhBryGusvAUHbFJY2JcvKJqSF5ZqJvIv7ia8JEtBagXOhzSVHsvJcuHpcCd1UAAuas4iJxYxQLkvMwJt7Qvk2d5bABrGQoXRPu+bat1KxGHx8qtVFKDjgngvH57+QW2OpIdDbTpZEu/qSOSw2xddqmLCce4= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB2792.namprd11.prod.outlook.com (52.135.228.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 7 Feb 2019 11:29:17 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 11:29:17 +0000 From: To: CC: , , , , Subject: [PATCH v2 7/8] staging: wilc1000: remove 'linux_' prefix in function names Thread-Topic: [PATCH v2 7/8] staging: wilc1000: remove 'linux_' prefix in function names Thread-Index: AQHUvthc7XqXqz9sa0OaUcurwVt/8A== Date: Thu, 7 Feb 2019 11:29:16 +0000 Message-ID: <1549538913-17463-8-git-send-email-ajay.kathat@microchip.com> References: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0060.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:20::22) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [27.59.126.210] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB2792;6:ujSH6VRCEn7cxd3MTz+dFOncIcYpt0SN7TZGulHyqxnzQOma4W8zAMA5vmivHYeHysIXQ5eEg0oC3nily6SLu1+wjSdj6WTc6feERc0yuoxss1odrUOPYSWf5D2iEqKj8FZI/JYmxUGvtWhtY5sFmyjxdMRQ6IJ6FDjzbNwyJ++fKAwfVzQePqjzdL6ErB1aNl61NZPxFfsj2SunuSYbZjKmsWnQqSnP9mlne4yCq3HMLyF+ctVy5fO6alhT7hIKYGVqjXV5lobHvbw2tmZqR5TSc+9erdqclqBebXGcTdv9AUINLmR0B9TpYehcCS+rlFd3sUOr17el+leuK7qs2jMLAAyw3nDTp3/dJWFcGbJR/992B91gbz2pIbBRP+yGclUUEaBZUfE25q6znLqiNNAmYsj9LBB6BnhQfQWHElApHPWpsgxGbaI+WukhNI6cTZ1w33ca7oJOUK+6gIQI7A==;5:S8+ze6udOrAlf+4PZyy7MQGjFSq0CcfE4FCVvUTnM8FGsN3V3QD40/BO9FiTChY2kom+Ip8FxlgJpWVtAtDIXdeyTV169jPIky9+lHyt+T2gbDmew5A743iq8QLgin6vZ5FPZ2M1nkNPB/R9q1tJRsfbpI4mQp/E98HwgQIlfo+uDXBjXh8z6PTBg3WR9zPnoqLKufGZAazniigjUqdsyQ==;7:jMLYicyI09zugQ/UpnElRbD3g13nOymhK6qWWCtt0jdO4xTILk2UWFkAb7nMrtu6WKD3y7WW1IANLk3tiNpTSTjVBDBgzNecF+YD4jAsx/ZPZwM/thjhlJZd0aa9Vgdgt6AslIBr8T9dD5IVkgCw3w== x-ms-office365-filtering-correlation-id: 5d0d30d6-2e5d-4ae5-8888-08d68cef7e82 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB2792; x-ms-traffictypediagnostic: BYAPR11MB2792: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(136003)(346002)(366004)(376002)(39860400002)(189003)(199004)(2501003)(256004)(7736002)(68736007)(107886003)(81166006)(81156014)(305945005)(186003)(8676002)(8936002)(66066001)(50226002)(97736004)(52116002)(4326008)(11346002)(86362001)(316002)(25786009)(476003)(2616005)(54906003)(478600001)(6486002)(105586002)(486006)(6916009)(106356001)(6436002)(14454004)(6512007)(53936002)(2906002)(2351001)(71200400001)(71190400001)(6116002)(3846002)(386003)(6506007)(446003)(76176011)(36756003)(26005)(5640700003)(102836004)(99286004)(72206003);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB2792;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 5ASW2wC+huSOu10Eu/ZfvFAPer/7LUFQc6zF7xJHRqcKg4g/JCUJPqcWkY+8bd4T/oqbA7v3mUAk71oZfdb/mqDTzH1irpxvCGst2Bu1qeGWzs5Y7WVIscji0538KgE9vs6M44H4HpzjWsCRb5DTAtQCyfabBn63NT+ivuvbm0st8xKWDaeM34U5WlhPQVDfymzlg4xZeBenyVoKFDnKxfqG6uSy26zxx4+y9rRCOzsu4BthQ8jkn3m5P1zUY36psEmvCFVU2DS1SMTQt4TBxt50iubLkVkMkbeOl+BK11W6srng8VlrtGKWKeCWMkPFJFmUaLvzLy8GSMyGIczzT7JVr90jp9GujzHR9l5L7BGXU2dY8dLejGdulPhLZ5bP7+K4P+VvyVzgxumPOfs2Di5JJi5RzxG1Da3U/CFf6b8= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 5d0d30d6-2e5d-4ae5-8888-08d68cef7e82 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 11:29:14.3483 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2792 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Remove 'linux_' prefix and replace it with 'wilc_' namespace. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/linux_wlan.c | 17 ++++++++--------- drivers/staging/wilc1000/wilc_sdio.c | 10 +++++----- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 1e2f6f4..1787154 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -139,7 +139,7 @@ int wilc_wlan_get_num_conn_ifcs(struct wilc *wilc) return ret_val; } -static int linux_wlan_txq_task(void *vp) +static int wilc_txq_task(void *vp) { int ret; u32 txq_count; @@ -202,7 +202,7 @@ static int wilc_wlan_get_firmware(struct net_device *dev) return ret; } -static int linux_wlan_start_firmware(struct net_device *dev) +static int wilc_start_firmware(struct net_device *dev) { struct wilc_vif *vif = netdev_priv(dev); struct wilc *wilc = vif->wilc; @@ -243,8 +243,7 @@ static int wilc1000_firmware_download(struct net_device *dev) return 0; } -static int linux_wlan_init_fw_config(struct net_device *dev, - struct wilc_vif *vif) +static int wilc_init_fw_config(struct net_device *dev, struct wilc_vif *vif) { struct wilc_priv *priv; struct host_if_drv *hif_drv; @@ -502,7 +501,7 @@ static int wlan_initialize_threads(struct net_device *dev) struct wilc_vif *vif = netdev_priv(dev); struct wilc *wilc = vif->wilc; - wilc->txq_thread = kthread_run(linux_wlan_txq_task, (void *)dev, + wilc->txq_thread = kthread_run(wilc_txq_task, (void *)dev, "K_TXQ_TASK"); if (IS_ERR(wilc->txq_thread)) { netdev_err(dev, "couldn't create TXQ thread\n"); @@ -560,7 +559,7 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif) goto fail_irq_enable; } - ret = linux_wlan_start_firmware(dev); + ret = wilc_start_firmware(dev); if (ret < 0) { ret = -EIO; goto fail_irq_enable; @@ -576,7 +575,7 @@ static int wilc_wlan_initialize(struct net_device *dev, struct wilc_vif *vif) firmware_ver[size] = '\0'; netdev_dbg(dev, "Firmware Ver = %s\n", firmware_ver); } - ret = linux_wlan_init_fw_config(dev, vif); + ret = wilc_init_fw_config(dev, vif); if (ret < 0) { netdev_err(dev, "Failed to configure firmware\n"); @@ -726,7 +725,7 @@ static void wilc_set_multicast_list(struct net_device *dev) kfree(mc_list); } -static void linux_wlan_tx_complete(void *priv, int status) +static void wilc_tx_complete(void *priv, int status) { struct tx_complete_data *pv_data = priv; @@ -762,7 +761,7 @@ netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev) tx_data->bssid = wilc->vif[vif->idx]->bssid; queue_count = wilc_wlan_txq_add_net_pkt(ndev, (void *)tx_data, tx_data->buff, tx_data->size, - linux_wlan_tx_complete); + wilc_tx_complete); if (queue_count > FLOW_CONTROL_UPPER_THRESHOLD) { if (wilc->vif[0]->mac_opened) diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c index 2ca6757..b789c57 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/wilc_sdio.c @@ -117,8 +117,8 @@ static int wilc_sdio_cmd53(struct wilc *wilc, struct sdio_cmd53 *cmd) return ret; } -static int linux_sdio_probe(struct sdio_func *func, - const struct sdio_device_id *id) +static int wilc_sdio_probe(struct sdio_func *func, + const struct sdio_device_id *id) { struct wilc *wilc; int ret; @@ -156,7 +156,7 @@ static int linux_sdio_probe(struct sdio_func *func, return 0; } -static void linux_sdio_remove(struct sdio_func *func) +static void wilc_sdio_remove(struct sdio_func *func) { struct wilc *wilc = sdio_get_drvdata(func); @@ -1127,8 +1127,8 @@ static const struct dev_pm_ops wilc_sdio_pm_ops = { static struct sdio_driver wilc_sdio_driver = { .name = SDIO_MODALIAS, .id_table = wilc_sdio_ids, - .probe = linux_sdio_probe, - .remove = linux_sdio_remove, + .probe = wilc_sdio_probe, + .remove = wilc_sdio_remove, .drv = { .pm = &wilc_sdio_pm_ops, .of_match_table = wilc_of_match, From patchwork Thu Feb 7 11:29:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Singh X-Patchwork-Id: 10800891 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BA73813B5 for ; Thu, 7 Feb 2019 11:29:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABA5C2A889 for ; Thu, 7 Feb 2019 11:29:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9FB392A8D5; Thu, 7 Feb 2019 11:29:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 489672A889 for ; Thu, 7 Feb 2019 11:29:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726799AbfBGL3X (ORCPT ); Thu, 7 Feb 2019 06:29:23 -0500 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:21405 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726965AbfBGL3W (ORCPT ); Thu, 7 Feb 2019 06:29:22 -0500 X-IronPort-AV: E=Sophos;i="5.56,564,1539673200"; d="scan'208";a="27383693" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Feb 2019 04:29:21 -0700 Received: from NAM05-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.105) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 7 Feb 2019 04:29:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cFta4Ih6QzZtjVebbTl/H7wybiKCFV5tw/NfcoFHJKM=; b=JWrl6xjcedZi4yQJCfm7VigP/79o6oakm+HiKsCc3AsjQCOQga6LE/9grIyUppt5DQqbR6peMYmImLSoh8GKOcphHCvGxiiVztSeXV+/Nz/0+YfRqntqoocx+1yzerch3lYP5gGmRuu+4mV3seRP9P4ebrkmWh3n7uv7/95StHw= Received: from BYAPR11MB2567.namprd11.prod.outlook.com (52.135.226.160) by BYAPR11MB2792.namprd11.prod.outlook.com (52.135.228.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 7 Feb 2019 11:29:20 +0000 Received: from BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d]) by BYAPR11MB2567.namprd11.prod.outlook.com ([fe80::cc6d:bc31:d5b:a27d%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 11:29:20 +0000 From: To: CC: , , , , Subject: [PATCH v2 8/8] staging: wilc1000: rename linux_wlan.c and linux_mon.c Thread-Topic: [PATCH v2 8/8] staging: wilc1000: rename linux_wlan.c and linux_mon.c Thread-Index: AQHUvtheGFgRMxrtYkW5lXuL+y5aOA== Date: Thu, 7 Feb 2019 11:29:20 +0000 Message-ID: <1549538913-17463-9-git-send-email-ajay.kathat@microchip.com> References: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> In-Reply-To: <1549538913-17463-1-git-send-email-ajay.kathat@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0060.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:20::22) To BYAPR11MB2567.namprd11.prod.outlook.com (2603:10b6:a02:c5::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ajay.Kathat@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [27.59.126.210] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BYAPR11MB2792;6:umOtvKeuBKn+pLSkT5oB5hB6dRIfSc7uPvG0Yx+qTwUatLKkjn+UuNA+7TTDmoGPFEOEzVQdw7fO4adnhU6FRLy8pmh9dwEk40xaGcMTSU/6937mhczeLIdnzbiVutibJfYvTlPW0J1KL5P5EPwV4cizaEWd/SzQ6vvP4aDPRC2R1zueTKj28ksHKh5ivGzpQV72PfvIdfChC6oZgYe+HXEWw+Kd+sUFzTF0OT3B0qpoInj+dx8fq4rWJ4oGEofltpOVIZzF/d2y9/V3pSKqho4YYZ300WjHCWsHKEMshhMQJg/+y2yHznlygAFgMW7n2g5Vsx/y5rVs4tzthWlb6q0pkm2qlDeZTguAkPzqKWvmJP5HhI98QWCG++3a6cflb75u0H+f1p6aQC5SPR8hu7svmHV7WpQgntmE1+Z3M+Dwv80O1O/ZqHdVfdDkxvGMlKw/kCkZT9923VCCDtwPMg==;5:te0mXxSUEY/Z5AUO7gngIPSq+48Cse/kbWdYr443GZIR4ZyliSKOENmZFD47WsF/oleSZOdg0a63SsijXCNmTxFvfxgl3MGpK3W31tfqr4qlFgDZOI7342f0ffN+QzMtB6OztLp1giAux9UZo4vSI7OlXnnU8P8hGN9VS3gLLG/WOGYcEaqoHN+s+Y8oDOr3LgOEUn6Viqm1KzbeDBQ60Q==;7:jY1pn+3vZu26uNS8NlWySHTmTaEapSdcVS/br6DcGhbl1env3xhwSTQ+9so1UrMDNyJFnPByPeEUNKKkEc8PVUmXZu9dwozXJCM/5cWbSQljlAW8sxT+uPOeKPsbYs6zVk6CbzIh0YF1gPYe6GohTA== x-ms-office365-filtering-correlation-id: 08c355f6-4feb-4ce4-8ff3-08d68cef8054 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:BYAPR11MB2792; x-ms-traffictypediagnostic: BYAPR11MB2792: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(136003)(346002)(366004)(376002)(39860400002)(189003)(199004)(2501003)(256004)(14444005)(7736002)(68736007)(107886003)(81166006)(81156014)(305945005)(186003)(8676002)(8936002)(66066001)(50226002)(97736004)(52116002)(4326008)(11346002)(86362001)(316002)(25786009)(476003)(2616005)(54906003)(478600001)(6486002)(105586002)(486006)(6916009)(106356001)(6436002)(14454004)(6512007)(53936002)(2906002)(2351001)(71200400001)(71190400001)(6116002)(3846002)(386003)(6506007)(446003)(76176011)(36756003)(26005)(5640700003)(102836004)(99286004)(72206003);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR11MB2792;H:BYAPR11MB2567.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: sbr54T5oI67wZ9xTYFE3d+6IUO3jdVaBMSxSLQGDoQw7mK5kY8Gws8JvzUpwqK9J8SPugfTAFsmMdb0Nwv253f1asMPgj7E/mgUFSbtPfzDSMeJdLm//wW/DNcxkgnm+xK/3tZkxmOEthePiI/3yaQpNI4hvLjmgzGIDPC+gxX8XqmX9jkt5I6W70HZFnATPZadm7O5n2zM8CFuuFBfiEtTqTFbuEEGC/sFimNdfsVSYIezsH1ZOVTFMTbzGMflS74Dbr4h2+phr+L7ex2ygCSJvVhQbo4IGmRurHg3ahhs0/igkFF6yVEcWVP5sQ3G8PiZOOY3vt9dFs9mYh2XG8WRc9WJdybg71G0ovOdc+RYKyDgu2ax4F6SmYjRArOPyiqrESreOvp5JWNgWJ0BdiPB30tX6nhUX4nlSVnh0G10= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 08c355f6-4feb-4ce4-8ff3-08d68cef8054 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 11:29:17.3424 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2792 X-OriginatorOrg: microchip.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ajay Singh Rename linux_wlan.c and linux_mon.c to wilc_netdev.c and wilc_mon.c to include 'wilc_' prefix. Signed-off-by: Ajay Singh --- drivers/staging/wilc1000/Makefile | 2 +- drivers/staging/wilc1000/{linux_mon.c => wilc_mon.c} | 0 drivers/staging/wilc1000/{linux_wlan.c => wilc_netdev.c} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename drivers/staging/wilc1000/{linux_mon.c => wilc_mon.c} (100%) rename drivers/staging/wilc1000/{linux_wlan.c => wilc_netdev.c} (100%) diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile index 72a4daa..2ad3fee 100644 --- a/drivers/staging/wilc1000/Makefile +++ b/drivers/staging/wilc1000/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_WILC1000) += wilc1000.o ccflags-y += -DFIRMWARE_1002=\"atmel/wilc1002_firmware.bin\" \ -DFIRMWARE_1003=\"atmel/wilc1003_firmware.bin\" -wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \ +wilc1000-objs := wilc_wfi_cfgoperations.o wilc_netdev.o wilc_mon.o \ host_interface.o wilc_wlan_cfg.o wilc_wlan.o obj-$(CONFIG_WILC1000_SDIO) += wilc1000-sdio.o diff --git a/drivers/staging/wilc1000/linux_mon.c b/drivers/staging/wilc1000/wilc_mon.c similarity index 100% rename from drivers/staging/wilc1000/linux_mon.c rename to drivers/staging/wilc1000/wilc_mon.c diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/wilc_netdev.c similarity index 100% rename from drivers/staging/wilc1000/linux_wlan.c rename to drivers/staging/wilc1000/wilc_netdev.c