[POWERPC] Replace remaining __FUNCTION__ occurrences (e48b1b45) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/powerpc/boot/libfdt-wrapper.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@
	#define check_err(err) \		#define check_err(err) \
	({ \		({ \
	if (BAD_ERROR(err) \|\| ((err < 0) && DEBUG)) \		if (BAD_ERROR(err) \|\| ((err < 0) && DEBUG)) \
	printf("%s():%d %s\n\r", __FUNCTION__, __LINE__, \		printf("%s():%d %s\n\r", __func__, __LINE__, \
	fdt_strerror(err)); \		fdt_strerror(err)); \
	if (BAD_ERROR(err)) \		if (BAD_ERROR(err)) \
	exit(); \		exit(); \

arch/powerpc/kernel/ibmebus.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -183,7 +183,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches)
	ret = ibmebus_create_device(child);		ret = ibmebus_create_device(child);
	if (ret) {		if (ret) {
	printk(KERN_ERR "%s: failed to create device (%i)",		printk(KERN_ERR "%s: failed to create device (%i)",
	__FUNCTION__, ret);		__func__, ret);
	of_node_put(child);		of_node_put(child);
	break;		break;
	}		}
	@@ -269,7 +269,7 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
	if (bus_find_device(&ibmebus_bus_type, NULL, path,		if (bus_find_device(&ibmebus_bus_type, NULL, path,
	ibmebus_match_path)) {		ibmebus_match_path)) {
	printk(KERN_WARNING "%s: %s has already been probed\n",		printk(KERN_WARNING "%s: %s has already been probed\n",
	__FUNCTION__, path);		__func__, path);
	rc = -EEXIST;		rc = -EEXIST;
	goto out;		goto out;
	}		}
	@@ -279,7 +279,7 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
	of_node_put(dn);		of_node_put(dn);
	} else {		} else {
	printk(KERN_WARNING "%s: no such device node: %s\n",		printk(KERN_WARNING "%s: no such device node: %s\n",
	__FUNCTION__, path);		__func__, path);
	rc = -ENODEV;		rc = -ENODEV;
	}		}

	@@ -308,7 +308,7 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus,
	return count;		return count;
	} else {		} else {
	printk(KERN_WARNING "%s: %s not on the bus\n",		printk(KERN_WARNING "%s: %s not on the bus\n",
	__FUNCTION__, path);		__func__, path);

	kfree(path);		kfree(path);
	return -ENODEV;		return -ENODEV;
	@@ -337,14 +337,14 @@ static int __init ibmebus_bus_init(void)
	err = of_bus_type_init(&ibmebus_bus_type, "ibmebus");		err = of_bus_type_init(&ibmebus_bus_type, "ibmebus");
	if (err) {		if (err) {
	printk(KERN_ERR "%s: failed to register IBM eBus.\n",		printk(KERN_ERR "%s: failed to register IBM eBus.\n",
	__FUNCTION__);		__func__);
	return err;		return err;
	}		}

	err = device_register(&ibmebus_bus_device);		err = device_register(&ibmebus_bus_device);
	if (err) {		if (err) {
	printk(KERN_WARNING "%s: device_register returned %i\n",		printk(KERN_WARNING "%s: device_register returned %i\n",
	__FUNCTION__, err);		__func__, err);
	bus_unregister(&ibmebus_bus_type);		bus_unregister(&ibmebus_bus_type);

	return err;		return err;

arch/powerpc/kernel/iommu.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -520,7 +520,7 @@ void iommu_free_table(struct iommu_table tbl, const char node_name)
	unsigned int order;		unsigned int order;

	if (!tbl \|\| !tbl->it_map) {		if (!tbl \|\| !tbl->it_map) {
	printk(KERN_ERR "%s: expected TCE map for %s\n", __FUNCTION__,		printk(KERN_ERR "%s: expected TCE map for %s\n", __func__,
	node_name);		node_name);
	return;		return;
	}		}
	@@ -530,7 +530,7 @@ void iommu_free_table(struct iommu_table tbl, const char node_name)
	for (i = 0; i < (tbl->it_size/64); i++) {		for (i = 0; i < (tbl->it_size/64); i++) {
	if (tbl->it_map[i] != 0) {		if (tbl->it_map[i] != 0) {
	printk(KERN_WARNING "%s: Unexpected TCEs for %s\n",		printk(KERN_WARNING "%s: Unexpected TCEs for %s\n",
	__FUNCTION__, node_name);		__func__, node_name);
	break;		break;
	}		}
	}		}

arch/powerpc/kernel/isa-bridge.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -99,7 +99,7 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
	*/		*/
	if ((pci_addr != 0) \|\| (isa_addr != 0)) {		if ((pci_addr != 0) \|\| (isa_addr != 0)) {
	printk(KERN_ERR "unexpected isa to pci mapping: %s\n",		printk(KERN_ERR "unexpected isa to pci mapping: %s\n",
	__FUNCTION__);		__func__);
	return;		return;
	}		}

arch/powerpc/kernel/lparcfg.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -226,7 +226,7 @@ static void parse_system_parameter_string(struct seq_file *m)
	unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);		unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
	if (!local_buffer) {		if (!local_buffer) {
	printk(KERN_ERR "%s %s kmalloc failure at line %d \n",		printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
	__FILE__, __FUNCTION__, __LINE__);		__FILE__, __func__, __LINE__);
	return;		return;
	}		}

	@@ -243,14 +243,14 @@ static void parse_system_parameter_string(struct seq_file *m)
	if (call_status != 0) {		if (call_status != 0) {
	printk(KERN_INFO		printk(KERN_INFO
	"%s %s Error calling get-system-parameter (0x%x)\n",		"%s %s Error calling get-system-parameter (0x%x)\n",
	__FILE__, __FUNCTION__, call_status);		__FILE__, __func__, call_status);
	} else {		} else {
	int splpar_strlen;		int splpar_strlen;
	int idx, w_idx;		int idx, w_idx;
	char *workbuffer = kzalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);		char *workbuffer = kzalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
	if (!workbuffer) {		if (!workbuffer) {
	printk(KERN_ERR "%s %s kmalloc failure at line %d \n",		printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
	__FILE__, __FUNCTION__, __LINE__);		__FILE__, __func__, __LINE__);
	kfree(local_buffer);		kfree(local_buffer);
	return;		return;
	}		}
	@@ -484,10 +484,10 @@ static ssize_t lparcfg_write(struct file file, const char __user buf,
	current_weight = (resource >> 5 * 8) & 0xFF;		current_weight = (resource >> 5 * 8) & 0xFF;

	pr_debug("%s: current_entitled = %lu, current_weight = %u\n",		pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
	__FUNCTION__, current_entitled, current_weight);		__func__, current_entitled, current_weight);

	pr_debug("%s: new_entitled = %lu, new_weight = %u\n",		pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
	__FUNCTION__, new_entitled_ptr, new_weight_ptr);		__func__, new_entitled_ptr, new_weight_ptr);

	retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr,		retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr,
	*new_weight_ptr);		*new_weight_ptr);
	@@ -502,7 +502,7 @@ static ssize_t lparcfg_write(struct file file, const char __user buf,
	retval = -EINVAL;		retval = -EINVAL;
	} else {		} else {
	printk(KERN_WARNING "%s: received unknown hv return code %ld",		printk(KERN_WARNING "%s: received unknown hv return code %ld",
	__FUNCTION__, retval);		__func__, retval);
	retval = -EIO;		retval = -EIO;
	}		}