Received: by 2002:a25:1104:0:0:0:0:0 with SMTP id 4csp334615ybr; Fri, 22 May 2020 07:46:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGiqkOuU4ZbsayGAWUNskWhjfo9CikRdsf14H38z2mqmLLyWzSxkieh7JPbMprT3LNeFPV X-Received: by 2002:a17:906:d86:: with SMTP id m6mr8726604eji.470.1590158806231; Fri, 22 May 2020 07:46:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590158806; cv=none; d=google.com; s=arc-20160816; b=mjFxqBStZR4zjK/nlJry9MyBfum1w+uvVwV5ZUjvKrNJvVxzU23A2SAiRi+1sIAMkL C39kTScOSwmHGEN89VTSfdt3gq/M1pS1VJvBafV/7+UukRh5tXRUzjQ5Z+DFTItu6WJ5 Ut+q5013MCGu4AtJDQCMBj+juj+U5UdCmfX321TjDWFLfxQ/04x/Yg19boqaydk3KPFs Dgt/pA1RiodhPFk+bYNUX8vT4zUWRC7Zmf62NfdLLeWSc03Z37DVpoXD3EOI3Ra0p4m3 a8q9qEart0LQitoZ5q/7Vm8IWn3APs4ExaYtZXqWTG0AAEHJbT3MrFDIqnq2QplqyGcV +XQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lndUHhIBtWPKF6b9+wJdK1d3D2WwjERflV7nFbkKNbU=; b=uEZhWM2hCJirQ/ExU6M0MDL6aex/prsvT9KbXlcUm2AFGez121J4mWCCg+Sb1U/RIv MPtQ48yY3jPaBv120gpks5FEFgdt0XD9hvZAFr+QrAPAyPDmABZw1mn2Wcf+rgawkYtW AeUr2pKWVkB+MWxKuEbH12n4VV18PoS6w3+P4GFe7+hxcWXzeHc1+yH3kguJH1AAYRhw SXn0XLmAa106lpFkxPzpwzzKIBw6rKWBQwP4DmPGO8DeTpO/ZZzgxIFtRfTntLR9LYhT V1su+7MYTZVu+0B6YDoZlgnO8ucvc26N75gB5Imwf3TcCXG8DCgGQIyFW68lbHCC/u8e v8wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="o68/I4gQ"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r1si5301974ejs.406.2020.05.22.07.46.12; Fri, 22 May 2020 07:46:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="o68/I4gQ"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730223AbgEVOpr (ORCPT + 99 others); Fri, 22 May 2020 10:45:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:48144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730061AbgEVOpq (ORCPT ); Fri, 22 May 2020 10:45:46 -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 9D1A22053B; Fri, 22 May 2020 14:45:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158745; bh=WFuyUyhfF0r2NIDkbY75yLpDco7NYc0wVtuTNDsXGf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o68/I4gQ9Zskbrv0XZqEAgSE4dXJ/pzXRdBWhxP0lKxz0F9wWU1del/rJ1fwqApo0 o8N5NzfTnU0o/kJa1Gp+9rZYobdlZJDosuejulBUbMGbGpV6Bh4kg196AQR/Qor0zK 6SX/7I03OBlaLyopYy/byBmYF+iAFb0nV89ZBT+Q= Received: by pali.im (Postfix) id D74BD51E; Fri, 22 May 2020 16:45:43 +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 02/11] mmc: sdio: Change macro names for Marvell 8688 modules Date: Fri, 22 May 2020 16:44:03 +0200 Message-Id: <20200522144412.19712-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522144412.19712-1-pali@kernel.org> References: <20200522144412.19712-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Add underscore as separator in Marvell 8688 macro names for better readability and consistency. Signed-off-by: Pali Rohár --- drivers/net/wireless/marvell/libertas/if_sdio.c | 2 +- include/linux/mmc/sdio_ids.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/marvell/libertas/if_sdio.c b/drivers/net/wireless/marvell/libertas/if_sdio.c index acf61b93b782..44fbd0acb87a 100644 --- a/drivers/net/wireless/marvell/libertas/if_sdio.c +++ b/drivers/net/wireless/marvell/libertas/if_sdio.c @@ -65,7 +65,7 @@ static const struct sdio_device_id if_sdio_ids[] = { { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_LIBERTAS) }, { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, - SDIO_DEVICE_ID_MARVELL_8688WLAN) }, + SDIO_DEVICE_ID_MARVELL_8688_WLAN) }, { /* end: all zeroes */ }, }; diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 96f43e0dc78f..7e992a0e6cc0 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -56,8 +56,8 @@ #define SDIO_VENDOR_ID_MARVELL 0x02df #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103 -#define SDIO_DEVICE_ID_MARVELL_8688WLAN 0x9104 -#define SDIO_DEVICE_ID_MARVELL_8688BT 0x9105 +#define SDIO_DEVICE_ID_MARVELL_8688_WLAN 0x9104 +#define SDIO_DEVICE_ID_MARVELL_8688_BT 0x9105 #define SDIO_DEVICE_ID_MARVELL_8797_F0 0x9128 #define SDIO_DEVICE_ID_MARVELL_8887_F0 0x9134 -- 2.20.1