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

Commit 2a2cf6b1 authored by Harvey Harrison's avatar Harvey Harrison Committed by Heiko Carstens
Browse files

[S390] replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 1e42f327

drivers/s390/block/dasd.c

+2 −2
Original line number Diff line number Diff line
@@ -980,12 +980,12 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, 
			break;

		case -ETIMEDOUT:

			printk(KERN_WARNING"%s(%s): request timed out\n",

			       __FUNCTION__, cdev->dev.bus_id);

			       __func__, cdev->dev.bus_id);

			//FIXME - dasd uses own timeout interface...

			break;

		default:

			printk(KERN_WARNING"%s(%s): unknown error %ld\n",

			       __FUNCTION__, cdev->dev.bus_id, PTR_ERR(irb));

			       __func__, cdev->dev.bus_id, PTR_ERR(irb));

		}

		return;

	}

drivers/s390/char/tape_34xx.c

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ tape_34xx_unit_check(struct tape_device *device, struct tape_request *request, 
			return tape_34xx_erp_failed(request, -ENOSPC);

		default:

			PRINT_ERR("Invalid op in %s:%i\n",

				  __FUNCTION__, __LINE__);

				  __func__, __LINE__);

			return tape_34xx_erp_failed(request, 0);

		}

	}

drivers/s390/char/vmwatchdog.c

+2 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int vmwdt_keepalive(void) 


	if (ret) {

		printk(KERN_WARNING "%s: problem setting interval %d, "

			"cmd %s\n", __FUNCTION__, vmwdt_interval,

			"cmd %s\n", __func__, vmwdt_interval,

			vmwdt_cmd);

	}

	return ret;
@@ -107,7 +107,7 @@ static int vmwdt_disable(void) 
	int ret = __diag288(wdt_cancel, 0, "", 0);

	if (ret) {

		printk(KERN_WARNING "%s: problem disabling watchdog\n",

			__FUNCTION__);

			__func__);

	}

	return ret;

}

drivers/s390/char/zcore.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int __init init_cpu_info(enum arch_id arch) 


	sa = kmalloc(sizeof(*sa), GFP_KERNEL);

	if (!sa) {

		ERROR_MSG("kmalloc failed: %s: %i\n",__FUNCTION__, __LINE__);

		ERROR_MSG("kmalloc failed: %s: %i\n",__func__, __LINE__);

		return -ENOMEM;

	}

	if (memcpy_hsa_kernel(sa, sys_info.sa_base, sys_info.sa_size) < 0) {

drivers/s390/cio/device_status.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ ccw_device_path_notoper(struct ccw_device *cdev) 
	stsch (sch->schid, &sch->schib);



	CIO_MSG_EVENT(0, "%s(0.%x.%04x) - path(s) %02x are "

		      "not operational \n", __FUNCTION__,

		      "not operational \n", __func__,

		      sch->schid.ssid, sch->schid.sch_no,

		      sch->schib.pmcw.pnom);