From nobody Sat Apr 11 20:02:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83E06C19F2D for ; Sat, 6 Aug 2022 15:49:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233015AbiHFPtW (ORCPT ); Sat, 6 Aug 2022 11:49:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230128AbiHFPtT (ORCPT ); Sat, 6 Aug 2022 11:49:19 -0400 Received: from smtp.smtpout.orange.fr (smtp-29.smtpout.orange.fr [80.12.242.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1934CDF2C for ; Sat, 6 Aug 2022 08:49:18 -0700 (PDT) Received: from pop-os.home ([90.11.190.129]) by smtp.orange.fr with ESMTPA id KM39oZntuGDTnKM3AobZvu; Sat, 06 Aug 2022 17:49:17 +0200 X-ME-Helo: pop-os.home X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Sat, 06 Aug 2022 17:49:17 +0200 X-ME-IP: 90.11.190.129 From: Christophe JAILLET To: Jaroslav Kysela , Takashi Iwai Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , patches@opensource.cirrus.com, alsa-devel@alsa-project.org Subject: [PATCH] ASoC: Fix the include guard used for include/sound/wm8904.h Date: Sat, 6 Aug 2022 17:49:14 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" __MFD_WM8994_PDATA_H__ is already used for: include/linux/mfd/wm8994/pdata.h Based on file names, use __MFD_WM8904_PDATA_H__ instead here. Signed-off-by: Christophe JAILLET Acked-by: Charles Keepax --- Not sure of if a Fixes: tag is needed. If yes, I would use: 9e50108668a7 ("mfd: Add initial WM8994 support") which introduced the conflict, even if: a91eb199e4dc8 ("ASoC: Initial WM8904 CODEC driver") which introduced the typo is more logical. No strong opinion on it. --- include/sound/wm8904.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sound/wm8904.h b/include/sound/wm8904.h index 88ac1870510e..f74293a83a17 100644 --- a/include/sound/wm8904.h +++ b/include/sound/wm8904.h @@ -7,8 +7,8 @@ * Author: Mark Brown */ =20 -#ifndef __MFD_WM8994_PDATA_H__ -#define __MFD_WM8994_PDATA_H__ +#ifndef __MFD_WM8904_PDATA_H__ +#define __MFD_WM8904_PDATA_H__ =20 /* Used to enable configuration of a GPIO to all zeros */ #define WM8904_GPIO_NO_CONFIG 0x8000 --=20 2.34.1