From: Nathan Chancellor Date: Tue, 15 Oct 2024 19:55:33 +0000 (-0700) Subject: staging: gpib: Fix PCI header include guard X-Git-Tag: v6.13-rc1~30^2~107 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4dfcc5fd0f9b19c0df9f0499861baf56ec2ba4cb;p=thirdparty%2Fkernel%2Flinux.git staging: gpib: Fix PCI header include guard Clang warns (or errors with CONFIG_WERROR=y): In file included from drivers/staging/gpib/ines/ines_gpib.c:19: drivers/staging/gpib/include/gpib_pci_ids.h:3:9: error: '__GPIB_PCI_IDS_H' is used as a header guard here, followed by #define of a different macro [-Werror,-Wheader-guard] 3 | #ifndef __GPIB_PCI_IDS_H | ^~~~~~~~~~~~~~~~ drivers/staging/gpib/include/gpib_pci_ids.h:4:9: note: '__GPIB_LINUX_PCI_IDS_H' is defined here; did you mean '__GPIB_PCI_IDS_H'? 4 | #define __GPIB_LINUX_PCI_IDS_H | ^~~~~~~~~~~~~~~~~~~~~~ | __GPIB_PCI_IDS_H Fix the define to match the guard like the note suggests, as that is clearly what was intended here. Fixes: 6c52d5e3cde2 ("staging: gpib: Add common include files for GPIB drivers") Signed-off-by: Nathan Chancellor Tested-by: Javier Carrasco Link: https://lore.kernel.org/r/20241015-staging-gpib-fix-pci-header-guard-v1-1-dfa45fe8d63f@kernel.org Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/gpib/include/gpib_pci_ids.h b/drivers/staging/gpib/include/gpib_pci_ids.h index 162b02deb0ade..52dcab07a7d18 100644 --- a/drivers/staging/gpib/include/gpib_pci_ids.h +++ b/drivers/staging/gpib/include/gpib_pci_ids.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef __GPIB_PCI_IDS_H -#define __GPIB_LINUX_PCI_IDS_H +#define __GPIB_PCI_IDS_H #ifndef PCI_VENDOR_ID_AMCC #define PCI_VENDOR_ID_AMCC 0x10e8