Date: Fri, 2 Sep 2022 21:53:07 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: e3b17b5042ed - main - qat: Drop extraneous parentheses from some macro values. Message-ID: <202209022153.282Lr7Ll041016@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e3b17b5042ed427d2298b3a00fac35cef65ac811 commit e3b17b5042ed427d2298b3a00fac35cef65ac811 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-09-02 21:49:40 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-09-02 21:49:40 +0000 qat: Drop extraneous parentheses from some macro values. This header duplicates a few #defines in "adf_cfg_strings.h". The latter header does not use the unneeded parentheses, but if a C file includes both of these headers, clang raises an error because the macro is redefined with a different value. Reviewed by: markj Sponsored by: DARPA Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D36329 --- sys/dev/qat/qat_api/qat_direct/include/icp_adf_cfg.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_cfg.h b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_cfg.h index db1e111f07bd..0c20333b7f67 100644 --- a/sys/dev/qat/qat_api/qat_direct/include/icp_adf_cfg.h +++ b/sys/dev/qat/qat_api/qat_direct/include/icp_adf_cfg.h @@ -52,9 +52,9 @@ #define ADF_SRAM_SIZE_IN_BYTES ("Sram_SizeInBytes") /* Device node id, tells to which die the device is * connected to */ -#define ADF_DEV_NODE_ID ("Device_NodeId") +#define ADF_DEV_NODE_ID "Device_NodeId" /* Device package id, this is accel_dev id */ -#define ADF_DEV_PKG_ID ("Device_PkgId") +#define ADF_DEV_PKG_ID "Device_PkgId" /* Device bus address, B.D.F (Bus(8bits),Device(5bits),Function(3bits)) */ #define ADF_DEV_BUS_ADDRESS ("Device_BusAddress") /* Number of Acceleration Engines */ @@ -76,9 +76,9 @@ /* Whether or not arbitration is supported */ #define ADF_DEV_ARB_SUPPORTED ("ArbitrationSupported") /* Slice Watch Dog Timer for CySym+Comp */ -#define ADF_DEV_SSM_WDT_BULK ("CySymAndDcWatchDogTimer") +#define ADF_DEV_SSM_WDT_BULK "CySymAndDcWatchDogTimer" /* Slice Watch Dog Timer for CyAsym */ -#define ADF_DEV_SSM_WDT_PKE ("CyAsymWatchDogTimer") +#define ADF_DEV_SSM_WDT_PKE "CyAsymWatchDogTimer" /* String names for the exposed sections of config file. */ #define GENERAL_SEC "GENERAL"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209022153.282Lr7Ll041016>