From nobody Fri Sep 2 21:53:07 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MKBVW3tn9z4bQPq; Fri, 2 Sep 2022 21:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MKBVW39cKz42vh; Fri, 2 Sep 2022 21:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662155587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3DpiUg2hxUMV9tFT/84hb+pf/G4wbS+qNOc8Wq7hk40=; b=FDFbcixz6G2YXCpeL7pD0QPmAfQzl50xjoQ1L+dHU4gYz7tv58SqkNhu767fqe5nqLwcV5 fPS6JdD37OZ3ScwrCnKMygYgkBnFGDKfp2rQRdmcRWLajW4YnOYZoRJSLMCni7llgm+Y2C NaTEKsokTqyL+gN4woOEkGfwjmc6/LF0tBv4aFMsraJ1kV7e6Mg5dF3HLh7DYxeXHWguNx zS/awDFYQl4Qr7rUvSOP7JnuV2behDbjoQxv4X/NIyC0Hmt2zmFW/o3Ezi0KpiQGYuZT3Q x2V/BFu9uptY4agPPDPrpRVtOQlWtZxpVmqDaCRLFwJ3SubQ91Yu5tW/3cYtlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MKBVW1y0lzwxB; Fri, 2 Sep 2022 21:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 282Lr7dA041017; Fri, 2 Sep 2022 21:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 282Lr7Ll041016; Fri, 2 Sep 2022 21:53:07 GMT (envelope-from git) Date: Fri, 2 Sep 2022 21:53:07 GMT Message-Id: <202209022153.282Lr7Ll041016@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e3b17b5042ed - main - qat: Drop extraneous parentheses from some macro values. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3b17b5042ed427d2298b3a00fac35cef65ac811 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662155587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3DpiUg2hxUMV9tFT/84hb+pf/G4wbS+qNOc8Wq7hk40=; b=AqtGu3f9FB0V19hn4eoqnIn9AWRQi5YwGi0oZnhbaWmTxvM+tzDYFK1gILpoYjl2dLzhKE EMs4O5xQEr5t0n3wgZfClaTCOGFmmdNy3V2veBjszCNS1hhpLakX4AlmkXiFPaGIYDuNL9 SADaS3flvqbgdztXkkodKceqyQFBOB34ozW8rL7g1LuEHeSJ9D5DFju9k84upf/Z5BIxIq lH9qMIXolNDZhX0SSHkk/NOTn2+AdCNuOHRUpALwoIvRd0EMinRxgUHFtZ24eZYKe5tZOe 8noBEA7vx90o4QD0362nVi13EYyzGbpD05MhVE5tn1MVfUfFZ4zXHOi3m+EG3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662155587; a=rsa-sha256; cv=none; b=dp9R1Er98+HA0mFRaqRpTFIDbrAUtM+nrQbscbXOURRl9kIBcZIeKgqCI5aATyAZZMAw7M 613B2m2zgW18w121N02wKC3wScgEsS4Tk2bd6LgspXTAKT5AzqnM8k7nHhK4d72jV+gz61 Hfl9HV1bPebmP0Z2PHw8gkq6kVfubGqpRwg9nXmQ86ix6149uelEkUn6mSAfs+ZDfP5WHU feZjIFtaQKv7tYz2Uyum4w6ViCAzVXxFPTDC8mCCOHPSK+qP9wd9dDEUtHotrWVVhBi2Wo 0/4kr0UIpJv/zuKeFC9uVZdANV/6iH4+0nhEHQcmHrg9+jcgBgHIN+aDwYrmUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e3b17b5042ed427d2298b3a00fac35cef65ac811 commit e3b17b5042ed427d2298b3a00fac35cef65ac811 Author: John Baldwin AuthorDate: 2022-09-02 21:49:40 +0000 Commit: John Baldwin 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"