soc: qcom: socinfo: use pr_fmt for function prefixes in prints

Avoid the repeating "__func__" in every print to reduce code
clutter. No functional change is expected due to this.

Change-Id: I88a3d9ce22785cc9a99fa50a38ce3686cae45f2a
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

1 files changed, 33 insertions, 40 deletions

diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
index 89724ef0b9f6..6b4c2c24da04 100644
--- a/drivers/soc/qcom/socinfo.c
+++ b/drivers/soc/qcom/socinfo.c
@@ -16,6 +16,8 @@
  *
  */
 
+#define pr_fmt(fmt) "%s: " fmt, __func__
+
 #include <linux/export.h>
 #include <linux/module.h>
 #include <linux/err.h>
@@ -740,8 +742,7 @@ msm_get_platform_subtype(struct device *dev,
 	hw_subtype = socinfo_get_platform_subtype();
 	if (HW_PLATFORM_QRD == socinfo_get_platform_type()) {
 		if (hw_subtype >= PLATFORM_SUBTYPE_QRD_INVALID) {
-			pr_err("%s: Invalid hardware platform sub type for qrd found\n",
-				__func__);
+			pr_err("Invalid hardware platform sub type for qrd found\n");
 			hw_subtype = PLATFORM_SUBTYPE_QRD_INVALID;
 		}
 		return snprintf(buf, PAGE_SIZE, "%-.32s\n",
@@ -799,8 +800,7 @@ msm_get_image_version(struct device *dev,
 
 	string_address = socinfo_get_image_version_base_address();
 	if (IS_ERR_OR_NULL(string_address)) {
-		pr_err("%s : Failed to get image version base address",
-				__func__);
+		pr_err("Failed to get image version base address");
 		return snprintf(buf, SMEM_IMAGE_VERSION_NAME_SIZE, "Unknown");
 	}
 	string_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;
@@ -820,8 +820,7 @@ msm_set_image_version(struct device *dev,
 		return count;
 	store_address = socinfo_get_image_version_base_address();
 	if (IS_ERR_OR_NULL(store_address)) {
-		pr_err("%s : Failed to get image version base address",
-				__func__);
+		pr_err("Failed to get image version base address");
 		return count;
 	}
 	store_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;
@@ -838,8 +837,7 @@ msm_get_image_variant(struct device *dev,
 
 	string_address = socinfo_get_image_version_base_address();
 	if (IS_ERR_OR_NULL(string_address)) {
-		pr_err("%s : Failed to get image version base address",
-				__func__);
+		pr_err("Failed to get image version base address");
 		return snprintf(buf, SMEM_IMAGE_VERSION_VARIANT_SIZE,
 		"Unknown");
 	}
@@ -861,8 +859,7 @@ msm_set_image_variant(struct device *dev,
 		return count;
 	store_address = socinfo_get_image_version_base_address();
 	if (IS_ERR_OR_NULL(store_address)) {
-		pr_err("%s : Failed to get image version base address",
-				__func__);
+		pr_err("Failed to get image version base address");
 		return count;
 	}
 	store_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;
@@ -880,8 +877,7 @@ msm_get_image_crm_version(struct device *dev,
 
 	string_address = socinfo_get_image_version_base_address();
 	if (IS_ERR_OR_NULL(string_address)) {
-		pr_err("%s : Failed to get image version base address",
-				__func__);
+		pr_err("Failed to get image version base address");
 		return snprintf(buf, SMEM_IMAGE_VERSION_OEM_SIZE, "Unknown");
 	}
 	string_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;
@@ -902,8 +898,7 @@ msm_set_image_crm_version(struct device *dev,
 		return count;
 	store_address = socinfo_get_image_version_base_address();
 	if (IS_ERR_OR_NULL(store_address)) {
-		pr_err("%s : Failed to get image version base address",
-				__func__);
+		pr_err("Failed to get image version base address");
 		return count;
 	}
 	store_address += current_image * SMEM_IMAGE_VERSION_SINGLE_BLOCK_SIZE;
@@ -1107,7 +1102,7 @@ static void __init populate_soc_sysfs_files(struct device *msm_soc_device)
 					&msm_soc_attr_build_id);
 		break;
 	default:
-		pr_err("%s:Unknown socinfo format: v%u.%u\n", __func__,
+		pr_err("Unknown socinfo format: v%u.%u\n",
 				SOCINFO_VERSION_MAJOR(legacy_format),
 				SOCINFO_VERSION_MINOR(legacy_format));
 		break;
@@ -1137,13 +1132,13 @@ static int __init socinfo_init_sysfs(void)
 	struct soc_device_attribute *soc_dev_attr;
 
 	if (!socinfo) {
-		pr_err("%s: No socinfo found!\n", __func__);
+		pr_err("No socinfo found!\n");
 		return -ENODEV;
 	}
 
 	soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
 	if (!soc_dev_attr) {
-		pr_err("%s: Soc Device alloc failed!\n", __func__);
+		pr_err("Soc Device alloc failed!\n");
 		return -ENOMEM;
 	}
 
@@ -1151,7 +1146,7 @@ static int __init socinfo_init_sysfs(void)
 	soc_dev = soc_device_register(soc_dev_attr);
 	if (IS_ERR_OR_NULL(soc_dev)) {
 		kfree(soc_dev_attr);
-		 pr_err("%s: Soc device register failed\n", __func__);
+		 pr_err("Soc device register failed\n");
 		 return -EIO;
 	}
 
@@ -1171,45 +1166,45 @@ static void socinfo_print(void)
 
 	switch (socinfo->v0_1.format) {
 	case SOCINFO_VERSION(0, 1):
-		pr_info("%s: v%u.%u, id=%u, ver=%u.%u\n",
-			__func__, f_maj, f_min, socinfo->v0_1.id, v_maj, v_min);
+		pr_info("v%u.%u, id=%u, ver=%u.%u\n",
+			f_maj, f_min, socinfo->v0_1.id, v_maj, v_min);
 		break;
 	case SOCINFO_VERSION(0, 2):
-		pr_info("%s: v%u.%u, id=%u, ver=%u.%u, "
+		pr_info("v%u.%u, id=%u, ver=%u.%u, "
 			 "raw_id=%u, raw_ver=%u\n",
-			__func__, f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
+			f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
 			socinfo->v0_2.raw_id, socinfo->v0_2.raw_version);
 		break;
 	case SOCINFO_VERSION(0, 3):
-		pr_info("%s: v%u.%u, id=%u, ver=%u.%u, "
+		pr_info("v%u.%u, id=%u, ver=%u.%u, "
 			 "raw_id=%u, raw_ver=%u, hw_plat=%u\n",
-			__func__, f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
+			f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
 			socinfo->v0_2.raw_id, socinfo->v0_2.raw_version,
 			socinfo->v0_3.hw_platform);
 		break;
 	case SOCINFO_VERSION(0, 4):
-		pr_info("%s: v%u.%u, id=%u, ver=%u.%u, "
+		pr_info("v%u.%u, id=%u, ver=%u.%u, "
 			 "raw_id=%u, raw_ver=%u, hw_plat=%u, hw_plat_ver=%u\n",
-			__func__, f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
+			f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
 			socinfo->v0_2.raw_id, socinfo->v0_2.raw_version,
 			socinfo->v0_3.hw_platform,
 			socinfo->v0_4.platform_version);
 		break;
 	case SOCINFO_VERSION(0, 5):
-		pr_info("%s: v%u.%u, id=%u, ver=%u.%u, "
+		pr_info("v%u.%u, id=%u, ver=%u.%u, "
 			 "raw_id=%u, raw_ver=%u, hw_plat=%u,  hw_plat_ver=%u\n"
 			" accessory_chip=%u\n",
-			__func__, f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
+			f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
 			socinfo->v0_2.raw_id, socinfo->v0_2.raw_version,
 			socinfo->v0_3.hw_platform,
 			socinfo->v0_4.platform_version,
 			socinfo->v0_5.accessory_chip);
 		break;
 	case SOCINFO_VERSION(0, 6):
-		pr_info("%s: v%u.%u, id=%u, ver=%u.%u, "
+		pr_info("v%u.%u, id=%u, ver=%u.%u, "
 			 "raw_id=%u, raw_ver=%u, hw_plat=%u,  hw_plat_ver=%u\n"
 			" accessory_chip=%u hw_plat_subtype=%u\n",
-			__func__, f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
+			f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
 			socinfo->v0_2.raw_id, socinfo->v0_2.raw_version,
 			socinfo->v0_3.hw_platform,
 			socinfo->v0_4.platform_version,
@@ -1218,8 +1213,8 @@ static void socinfo_print(void)
 		break;
 	case SOCINFO_VERSION(0, 7):
 	case SOCINFO_VERSION(0, 8):
-		pr_info("%s: v%u.%u, id=%u, ver=%u.%u, raw_id=%u, raw_ver=%u, hw_plat=%u, hw_plat_ver=%u\n accessory_chip=%u, hw_plat_subtype=%u, pmic_model=%u, pmic_die_revision=%u\n",
-			__func__, f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
+		pr_info("v%u.%u, id=%u, ver=%u.%u, raw_id=%u, raw_ver=%u, hw_plat=%u, hw_plat_ver=%u\n accessory_chip=%u, hw_plat_subtype=%u, pmic_model=%u, pmic_die_revision=%u\n",
+			f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
 			socinfo->v0_2.raw_id, socinfo->v0_2.raw_version,
 			socinfo->v0_3.hw_platform,
 			socinfo->v0_4.platform_version,
@@ -1229,8 +1224,8 @@ static void socinfo_print(void)
 			socinfo->v0_7.pmic_die_revision);
 		break;
 	case SOCINFO_VERSION(0, 9):
-		pr_info("%s: v%u.%u, id=%u, ver=%u.%u, raw_id=%u, raw_ver=%u, hw_plat=%u, hw_plat_ver=%u\n accessory_chip=%u, hw_plat_subtype=%u, pmic_model=%u, pmic_die_revision=%u foundry_id=%u\n",
-			__func__, f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
+		pr_info("v%u.%u, id=%u, ver=%u.%u, raw_id=%u, raw_ver=%u, hw_plat=%u, hw_plat_ver=%u\n accessory_chip=%u, hw_plat_subtype=%u, pmic_model=%u, pmic_die_revision=%u foundry_id=%u\n",
+			f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
 			socinfo->v0_2.raw_id, socinfo->v0_2.raw_version,
 			socinfo->v0_3.hw_platform,
 			socinfo->v0_4.platform_version,
@@ -1241,8 +1236,8 @@ static void socinfo_print(void)
 			socinfo->v0_9.foundry_id);
 		break;
 	case SOCINFO_VERSION(0, 10):
-		pr_info("%s: v%u.%u, id=%u, ver=%u.%u, raw_id=%u, raw_ver=%u, hw_plat=%u, hw_plat_ver=%u\n accessory_chip=%u, hw_plat_subtype=%u, pmic_model=%u, pmic_die_revision=%u foundry_id=%u serial_number=%u\n",
-			__func__, f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
+		pr_info("v%u.%u, id=%u, ver=%u.%u, raw_id=%u, raw_ver=%u, hw_plat=%u, hw_plat_ver=%u\n accessory_chip=%u, hw_plat_subtype=%u, pmic_model=%u, pmic_die_revision=%u foundry_id=%u serial_number=%u\n",
+			f_maj, f_min, socinfo->v0_1.id, v_maj, v_min,
 			socinfo->v0_2.raw_id, socinfo->v0_2.raw_version,
 			socinfo->v0_3.hw_platform,
 			socinfo->v0_4.platform_version,
@@ -1255,8 +1250,7 @@ static void socinfo_print(void)
 		break;
 
 	default:
-		pr_err("%s: Unknown format found: v%u.%u\n",
-			__func__, f_maj, f_min);
+		pr_err("Unknown format found: v%u.%u\n", f_maj, f_min);
 		break;
 	}
 }
@@ -1272,8 +1266,7 @@ int __init socinfo_init(void)
 	socinfo = smem_get_entry(SMEM_HW_SW_BUILD_ID, &size, 0,
 				 SMEM_ANY_HOST_FLAG);
 	if (IS_ERR_OR_NULL(socinfo)) {
-		pr_warn("%s: Can't find SMEM_HW_SW_BUILD_ID; falling back on dummy values.\n",
-				__func__);
+		pr_warn("Can't find SMEM_HW_SW_BUILD_ID; falling back on dummy values.\n");
 		socinfo = setup_dummy_socinfo();
 	}