Received: by 2002:a25:1104:0:0:0:0:0 with SMTP id 4csp334614ybr; Fri, 22 May 2020 07:46:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1NGYK07JrLLJLpHDKL6n1vgj4CVopGNxB50sqB+DrJZpLgCBOmVPhqovTgTicpksCaJ0W X-Received: by 2002:a17:906:a0c2:: with SMTP id bh2mr8389391ejb.406.1590158806128; 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=t2RPc32Uq2qDsRKGuQWVPuK/hLM8ZNKgzae3bpMdj9IwZBMKv1cvqBR//AWU98pIii Ljl1sbUR30LqiMesmNxYEoPjXKOQoeXrpVMZvsGwNZromLarLQP7vIXGHIZ6g8lT87O/ zFvIgRUoo3jYo23YEYe4mvwzv6LtKiihZ3iEIzq8K+4ZKjU7hsNMi9b1VHDcAQ2HTn2z vBsVC+4LCH82qtC4SI2BmpCukBo/MkeZDwd4S7Uu1KHpSaHn+4Zf1xy8MljQg7OlMjNL XV7OL7dxVDXVPdrjULghvd81wdoIOm6AF/ikM8u6P7DGrQqxw3gJVoejkcSDW6RYqONt L8wA== 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=zV7HddhkWjSpbL89uQiruqEqnTL/uCI+QbLLxE5tpCw=; b=METxQcuBwWUEmrZ56Uq4TzDcbICs/bKAP3EtQ0f1rS6MC0WRah1fJ2xl6Vn25IHoBi b+czTxWR0JUXekXVTyqK9kx2HJXzldgnhAJ0N1IMiJb8+2bQhOCAOaWjbwUCCq6+cHl3 LkAZjZS4DVCCSaqFokxGPEacNCGGc42NlxnczIwKn692dZMVhQSDPR6puuSW3WlfxLFC Tb3Bm5k7kPmrdz15p76dnuwOENF1aC9c/j8y6uvd0a21mB/Ckbm6WVD6aW3mmb61uKmr 66oUJbMu8OoL767u0Fpwi1tLd4QkVx3vZizlQUqiKRJesiGbTdF/9GVL+4EGpNseDvHk Fv8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oMliYZS+; 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 r21si4652574edi.133.2020.05.22.07.46.22; 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=oMliYZS+; 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 S1730297AbgEVOp5 (ORCPT + 99 others); Fri, 22 May 2020 10:45:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:48352 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730061AbgEVOp4 (ORCPT ); Fri, 22 May 2020 10:45:56 -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 5D853204EF; Fri, 22 May 2020 14:45:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158755; bh=fmZWyu8S8zz/WmoFW+uWpo4sd9DDFs+iV3itMZTeMR0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oMliYZS+G4ZRp+xBCR+xbnXAAMh7UGnCuzkwQYS8ohlmf0AGqMfMh9j9ot4+ycbiY BpMyLY2icnsETEivqZGwzx8hDkx4nycPgULF3ulzlTbwmq7TlKa+/mc+4p6bGNAJ34 ElE/GMzYjlMwFIJE448OlJo78KRdeVt+IEEreRpE= Received: by pali.im (Postfix) id 93A9A51E; Fri, 22 May 2020 16:45:53 +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 05/11] mmc: sdio: Move SDIO IDs from btmtksdio driver to common include file Date: Fri, 22 May 2020 16:44:06 +0200 Message-Id: <20200522144412.19712-6-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 Define appropriate macro names for consistency with other macros. Signed-off-by: Pali Rohár --- drivers/bluetooth/btmtksdio.c | 4 ++-- include/linux/mmc/sdio_ids.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c index 519788c442ca..bff095be2f97 100644 --- a/drivers/bluetooth/btmtksdio.c +++ b/drivers/bluetooth/btmtksdio.c @@ -51,9 +51,9 @@ static const struct btmtksdio_data mt7668_data = { }; static const struct sdio_device_id btmtksdio_table[] = { - {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, 0x7663), + {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, SDIO_DEVICE_ID_MEDIATEK_MT7663), .driver_data = (kernel_ulong_t)&mt7663_data }, - {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, 0x7668), + {SDIO_DEVICE(SDIO_VENDOR_ID_MEDIATEK, SDIO_DEVICE_ID_MEDIATEK_MT7668), .driver_data = (kernel_ulong_t)&mt7668_data }, { } /* Terminating entry */ }; diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 1237e1048d06..c9aca57d4dea 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -80,6 +80,8 @@ #define SDIO_DEVICE_ID_MARVELL_8987_BT 0x914a #define SDIO_VENDOR_ID_MEDIATEK 0x037a +#define SDIO_DEVICE_ID_MEDIATEK_MT7663 0x7663 +#define SDIO_DEVICE_ID_MEDIATEK_MT7668 0x7668 #define SDIO_VENDOR_ID_SIANO 0x039a #define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201 -- 2.20.1