Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0467cd78 authored by Jordan Crouse's avatar Jordan Crouse
Browse files

msm: pcie: Fix macro compiler warning for pci-msm.c 



Fix a few warnings that seem to be related to improper argument
concatenation in the macros:

 drivers/pci/controller/pci-msm.c:246:4: error:
   too many arguments for format [-Werror=format-extra-args]
 drivers/pci/controller/pci-msm.c:248:34: error:
   too many arguments for format [-Werror=format-extra-args]

Fixes: 42576b8a ("msm: pcie: add PCIe root complex bus driver snapshot")
Change-Id: Ic0dedbad305288ad72f917569904335f457a819a
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent 30ae9a9f

drivers/pci/controller/pci-msm.c

+19 −17
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.*/

/* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.*/





#include <asm/dma-iommu.h>

#include <asm/dma-iommu.h>

#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>

#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
@@ -197,55 +197,57 @@ 
#define PCIE_DBG(dev, fmt, arg...) do {			 \

#define PCIE_DBG(dev, fmt, arg...) do {			 \

	if ((dev) && (dev)->ipc_log_long)   \

	if ((dev) && (dev)->ipc_log_long)   \

		ipc_log_string((dev)->ipc_log_long, \

		ipc_log_string((dev)->ipc_log_long, \

			"DBG1:%s: " fmt, __func__, arg); \

			"DBG1:%s: " fmt, __func__, ##arg); \

	if ((dev) && (dev)->ipc_log)   \

	if ((dev) && (dev)->ipc_log)   \

		ipc_log_string((dev)->ipc_log, "%s: " fmt, __func__, arg); \

		ipc_log_string((dev)->ipc_log, "%s: " fmt, __func__, ##arg); \

	if (msm_pcie_debug_mask)   \

	if (msm_pcie_debug_mask)   \

		pr_alert("%s: " fmt, __func__, arg);		  \

		pr_alert("%s: " fmt, __func__, ##arg);		  \

	} while (0)

	} while (0)





#define PCIE_DBG2(dev, fmt, arg...) do {			 \

#define PCIE_DBG2(dev, fmt, arg...) do {			 \

	if ((dev) && (dev)->ipc_log)   \

	if ((dev) && (dev)->ipc_log)   \

		ipc_log_string((dev)->ipc_log, "DBG2:%s: " fmt, __func__, arg);\

		ipc_log_string((dev)->ipc_log, "DBG2:%s: " fmt, \

				__func__, ##arg);\

	if (msm_pcie_debug_mask)   \

	if (msm_pcie_debug_mask)   \

		pr_alert("%s: " fmt, __func__, arg);              \

		pr_alert("%s: " fmt, __func__, ##arg);              \

	} while (0)

	} while (0)





#define PCIE_DBG3(dev, fmt, arg...) do {			 \

#define PCIE_DBG3(dev, fmt, arg...) do {			 \

	if ((dev) && (dev)->ipc_log)   \

	if ((dev) && (dev)->ipc_log)   \

		ipc_log_string((dev)->ipc_log, "DBG3:%s: " fmt, __func__, arg);\

		ipc_log_string((dev)->ipc_log, "DBG3:%s: " fmt, \

				__func__, ##arg);\

	if (msm_pcie_debug_mask)   \

	if (msm_pcie_debug_mask)   \

		pr_alert("%s: " fmt, __func__, arg);              \

		pr_alert("%s: " fmt, __func__, ##arg);              \

	} while (0)

	} while (0)





#define PCIE_DUMP(dev, fmt, arg...) do {			\

#define PCIE_DUMP(dev, fmt, arg...) do {			\

	if ((dev) && (dev)->ipc_log_dump) \

	if ((dev) && (dev)->ipc_log_dump) \

		ipc_log_string((dev)->ipc_log_dump, \

		ipc_log_string((dev)->ipc_log_dump, \

			"DUMP:%s: " fmt, __func__, arg); \

			"DUMP:%s: " fmt, __func__, ##arg); \

	} while (0)

	} while (0)





#define PCIE_DBG_FS(dev, fmt, arg...) do {			\

#define PCIE_DBG_FS(dev, fmt, arg...) do {			\

	if ((dev) && (dev)->ipc_log_dump) \

	if ((dev) && (dev)->ipc_log_dump) \

		ipc_log_string((dev)->ipc_log_dump, \

		ipc_log_string((dev)->ipc_log_dump, \

			"DBG_FS:%s: " fmt, __func__, arg); \

			"DBG_FS:%s: " fmt, __func__, ##arg); \

	pr_alert("%s: " fmt, __func__, arg); \

	pr_alert("%s: " fmt, __func__, ##arg); \

	} while (0)

	} while (0)





#define PCIE_INFO(dev, fmt, arg...) do {			 \

#define PCIE_INFO(dev, fmt, arg...) do {			 \

	if ((dev) && (dev)->ipc_log_long)   \

	if ((dev) && (dev)->ipc_log_long)   \

		ipc_log_string((dev)->ipc_log_long, \

		ipc_log_string((dev)->ipc_log_long, \

			"INFO:%s: " fmt, __func__, arg); \

			"INFO:%s: " fmt, __func__, ##arg); \

	if ((dev) && (dev)->ipc_log)   \

	if ((dev) && (dev)->ipc_log)   \

		ipc_log_string((dev)->ipc_log, "%s: " fmt, __func__, arg); \

		ipc_log_string((dev)->ipc_log, "%s: " fmt, __func__, ##arg); \

	pr_info("%s: " fmt, __func__, arg);  \

	pr_info("%s: " fmt, __func__, ##arg);  \

	} while (0)

	} while (0)





#define PCIE_ERR(dev, fmt, arg...) do {			 \

#define PCIE_ERR(dev, fmt, arg...) do {			 \

	if ((dev) && (dev)->ipc_log_long)   \

	if ((dev) && (dev)->ipc_log_long)   \

		ipc_log_string((dev)->ipc_log_long, \

		ipc_log_string((dev)->ipc_log_long, \

			"ERR:%s: " fmt, __func__, arg); \

			"ERR:%s: " fmt, __func__, ##arg); \

	if ((dev) && (dev)->ipc_log)   \

	if ((dev) && (dev)->ipc_log)   \

		ipc_log_string((dev)->ipc_log, "%s: " fmt, __func__, arg); \

		ipc_log_string((dev)->ipc_log, "%s: " fmt, __func__, ##arg); \

	pr_err("%s: " fmt, __func__, arg);  \

	pr_err("%s: " fmt, __func__, arg);  \

	} while (0)

	} while (0)
@@ -6046,7 +6048,7 @@ static int msm_pci_iommu_init(struct msm_root_dev_t *root_dev) 
	ret = __depr_arm_iommu_attach_device(&pci_dev->dev, mapping);

	ret = __depr_arm_iommu_attach_device(&pci_dev->dev, mapping);

	if (ret) {

	if (ret) {

		PCIE_ERR(pcie_dev,

		PCIE_ERR(pcie_dev,

			"failed to iommu attach device (%d)\n",

			"RC%d: failed to iommu attach device (%d)\n",

			pcie_dev->rc_idx, ret);

			pcie_dev->rc_idx, ret);

		goto release_mapping;

		goto release_mapping;

	}

	}