From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 00/11] mmc: sdio: Move SDIO IDs from drivers to common include file Date: Fri, 22 May 2020 16:44:01 +0200 Message-Id: <20200522144412.19712-1-pali@kernel.org> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "ath10k" Errors-To: ath10k-bounces+kvalo=adurom.com@lists.infradead.org To: Ulf Hansson , linux-mmc@vger.kernel.org Cc: brcm80211-dev-list.pdl@broadcom.com, libertas-dev@lists.infradead.org, Xinming Hu , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Amitkumar Karwar , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Ganapathi Bhat , ath10k@lists.infradead.org, Matthias Brugger , Mauro Carvalho Chehab , brcm80211-dev-list@cypress.com, Kalle Valo , b43-dev@lists.infradead.org TW9zdCBTRElPIElEcyBhcmUgZGVmaW5lZCBpbiB0aGUgY29tbW9uIGluY2x1ZGUgZmlsZSBsaW51 eC9tbWMvc2Rpb19pZHMuaC4KQnV0IHNvbWUgZHJpdmVycyBkZWZpbmUgSURzIGxvY2FsbHkgb3Ig ZG8gbm90IHVzZSBleGlzdGluZyBtYWNyb3MgZnJvbSB0aGUKY29tbW9uIGluY2x1ZGUgZmlsZS4K ClRoaXMgcGF0Y2ggc2VyaWVzIGZpeGVzIGFib3ZlIGluY29uc2lzdGVuY3kuIEl0IGRlZmluZXMg bWlzc2luZyBtYWNybyBuYW1lcwphbmQgbW92ZXMgYWxsIHJlbWFpbmluZyBTRElPIElEcyBmcm9t IGRyaXZlcnMgdG8gdGhlIGNvbW1vbiBpbmNsdWRlIGZpbGUuCkFsc28gc29tZSBtYWNybyBuYW1l cyBhcmUgY2hhbmdlZCB0byBmb2xsb3cgZXhpc3RpbmcgbmFtaW5nIGNvbnZlbnRpb25zLgoKUGFs aSBSb2jDoXIgKDExKToKICBtbWM6IHNkaW86IEZpeCBtYWNybyBuYW1lIGZvciBNYXJ2ZWxsIGRl dmljZSB3aXRoIElEIDB4OTEzNAogIG1tYzogc2RpbzogQ2hhbmdlIG1hY3JvIG5hbWVzIGZvciBN YXJ2ZWxsIDg2ODggbW9kdWxlcwogIG1tYzogc2RpbzogTW92ZSBTRElPIElEcyBmcm9tIG13aWZp ZXggZHJpdmVyIHRvIGNvbW1vbiBpbmNsdWRlIGZpbGUKICBtbWM6IHNkaW86IE1vdmUgU0RJTyBJ RHMgZnJvbSBidG1ydmwgZHJpdmVyIHRvIGNvbW1vbiBpbmNsdWRlIGZpbGUKICBtbWM6IHNkaW86 IE1vdmUgU0RJTyBJRHMgZnJvbSBidG10a3NkaW8gZHJpdmVyIHRvIGNvbW1vbiBpbmNsdWRlIGZp bGUKICBtbWM6IHNkaW86IE1vdmUgU0RJTyBJRHMgZnJvbSBzbXNzZGlvIGRyaXZlciB0byBjb21t b24gaW5jbHVkZSBmaWxlCiAgbW1jOiBzZGlvOiBNb3ZlIFNESU8gSURzIGZyb20gYXRoNmtsIGRy aXZlciB0byBjb21tb24gaW5jbHVkZSBmaWxlCiAgbW1jOiBzZGlvOiBNb3ZlIFNESU8gSURzIGZy b20gYXRoMTBrIGRyaXZlciB0byBjb21tb24gaW5jbHVkZSBmaWxlCiAgbW1jOiBzZGlvOiBNb3Zl IFNESU8gSURzIGZyb20gYjQzLXNkaW8gZHJpdmVyIHRvIGNvbW1vbiBpbmNsdWRlIGZpbGUKICBt bWM6IHNkaW86IEZpeCBDeXByZXNzIFNESU8gSURzIG1hY3JvcyBpbiBjb21tb24gaW5jbHVkZSBm aWxlCiAgbW1jOiBzZGlvOiBTb3J0IGFsbCBTRElPIElEcyBpbiBjb21tb24gaW5jbHVkZSBmaWxl CgogZHJpdmVycy9ibHVldG9vdGgvYnRtcnZsX3NkaW8uYyAgICAgICAgICAgICAgIHwgMTggKyst LQogZHJpdmVycy9ibHVldG9vdGgvYnRtdGtzZGlvLmMgICAgICAgICAgICAgICAgIHwgIDQgKy0K IGRyaXZlcnMvbWVkaWEvbW1jL3NpYW5vL3Ntc3NkaW8uYyAgICAgICAgICAgICB8IDEwICstCiBk cml2ZXJzL21tYy9jb3JlL3F1aXJrcy5oICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogZHJp dmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDEway9zZGlvLmMgICAgICAgIHwgMjUgKystLS0KIGRy aXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGgxMGsvc2Rpby5oICAgICAgICB8ICA4IC0tCiBkcml2 ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoNmtsL2hpZi5oICAgICAgICAgfCAgNiAtLQogZHJpdmVy cy9uZXQvd2lyZWxlc3MvYXRoL2F0aDZrbC9zZGlvLmMgICAgICAgIHwgMTcgKystLQogZHJpdmVy cy9uZXQvd2lyZWxlc3MvYnJvYWRjb20vYjQzL3NkaW8uYyAgICAgIHwgIDQgKy0KIC4uLi9icm9h ZGNvbS9icmNtODAyMTEvYnJjbWZtYWMvYmNtc2RoLmMgICAgICB8ICA2ICstCiAuLi4vYnJvYWRj b20vYnJjbTgwMjExL2JyY21mbWFjL3NkaW8uYyAgICAgICAgfCAgNCArLQogLi4uL25ldC93aXJl bGVzcy9tYXJ2ZWxsL2xpYmVydGFzL2lmX3NkaW8uYyAgIHwgIDIgKy0KIGRyaXZlcnMvbmV0L3dp cmVsZXNzL21hcnZlbGwvbXdpZmlleC9zZGlvLmMgICB8IDM4ICsrLS0tLS0tCiBpbmNsdWRlL2xp bnV4L21tYy9zZGlvX2lkcy5oICAgICAgICAgICAgICAgICAgfCA5NCArKysrKysrKysrKysrKy0t LS0tCiAxNCBmaWxlcyBjaGFuZ2VkLCAxMjAgaW5zZXJ0aW9ucygrKSwgMTE4IGRlbGV0aW9ucygt KQoKLS0gCjIuMjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmF0aDEwayBtYWlsaW5nIGxpc3QKYXRoMTBrQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0 cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9hdGgxMGsK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE1B3C433DF for ; Fri, 22 May 2020 14:45:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 835F0205CB for ; Fri, 22 May 2020 14:45:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158718; bh=jgtLSxW/rFemUDRGqeFehVEu0MdxG9OUPhnEvnFbKXo=; h=From:To:Cc:Subject:Date:List-ID:From; b=hNWKYPfl6v/TE/MaEjIGLyPBz4B0gFAHcB7pa11VPR97hgHouefIJQEha4aMpT5Gu RvgE5rJN9Nfs0tKiMqjGVNWDOWL+/Q/OYYUnV2ntvgGwL3EUuNM01eW47PSmnfwIjD lngK/A2lfYqIfm9giJEZzgcKvh+1Ke4LOeULFeHI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729931AbgEVOpS (ORCPT ); Fri, 22 May 2020 10:45:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:47562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729868AbgEVOpR (ORCPT ); Fri, 22 May 2020 10:45:17 -0400 Received: from pali.im (pali.im [31.31.79.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A9213204EF; Fri, 22 May 2020 14:45:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158716; bh=jgtLSxW/rFemUDRGqeFehVEu0MdxG9OUPhnEvnFbKXo=; h=From:To:Cc:Subject:Date:From; b=gfg74FKs4mhp0Qzzg9jCxDSD/GyytTIjGv6siWmpqnDJFXa2okumtbOmzNmz+zRIp an1ToAw01OIlj3XAV2Q1zZ5lP4RCLYtL7fsG/NRIfagePkLDfPXqlqbeyObxr6V5Bs n0bYQOZXUll0jLzVx7TZ012GMiKrng2FUTFfzjPs= Received: by pali.im (Postfix) id DA32B51E; Fri, 22 May 2020 16:45:13 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Ulf Hansson , linux-mmc@vger.kernel.org Cc: Matthias Brugger , Mauro Carvalho Chehab , Kalle Valo , Amitkumar Karwar , Ganapathi Bhat , Xinming Hu , linux-kernel@vger.kernel.org, ath10k@lists.infradead.org, b43-dev@lists.infradead.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 00/11] mmc: sdio: Move SDIO IDs from drivers to common include file Date: Fri, 22 May 2020 16:44:01 +0200 Message-Id: <20200522144412.19712-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Most SDIO IDs are defined in the common include file linux/mmc/sdio_ids.h. But some drivers define IDs locally or do not use existing macros from the common include file. This patch series fixes above inconsistency. It defines missing macro names and moves all remaining SDIO IDs from drivers to the common include file. Also some macro names are changed to follow existing naming conventions. Pali Rohár (11): mmc: sdio: Fix macro name for Marvell device with ID 0x9134 mmc: sdio: Change macro names for Marvell 8688 modules mmc: sdio: Move SDIO IDs from mwifiex driver to common include file mmc: sdio: Move SDIO IDs from btmrvl driver to common include file mmc: sdio: Move SDIO IDs from btmtksdio driver to common include file mmc: sdio: Move SDIO IDs from smssdio driver to common include file mmc: sdio: Move SDIO IDs from ath6kl driver to common include file mmc: sdio: Move SDIO IDs from ath10k driver to common include file mmc: sdio: Move SDIO IDs from b43-sdio driver to common include file mmc: sdio: Fix Cypress SDIO IDs macros in common include file mmc: sdio: Sort all SDIO IDs in common include file drivers/bluetooth/btmrvl_sdio.c | 18 ++-- drivers/bluetooth/btmtksdio.c | 4 +- drivers/media/mmc/siano/smssdio.c | 10 +- drivers/mmc/core/quirks.h | 2 +- drivers/net/wireless/ath/ath10k/sdio.c | 25 ++--- drivers/net/wireless/ath/ath10k/sdio.h | 8 -- drivers/net/wireless/ath/ath6kl/hif.h | 6 -- drivers/net/wireless/ath/ath6kl/sdio.c | 17 ++-- drivers/net/wireless/broadcom/b43/sdio.c | 4 +- .../broadcom/brcm80211/brcmfmac/bcmsdh.c | 6 +- .../broadcom/brcm80211/brcmfmac/sdio.c | 4 +- .../net/wireless/marvell/libertas/if_sdio.c | 2 +- drivers/net/wireless/marvell/mwifiex/sdio.c | 38 ++------ include/linux/mmc/sdio_ids.h | 94 ++++++++++++++----- 14 files changed, 120 insertions(+), 118 deletions(-) -- 2.20.1