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

Commit eb63963a authored by Harvey Harrison's avatar Harvey Harrison Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

[bart: fix checkpatch.pl errors in ide-lib.c and ppc/mpc8xx.c while at it]

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent c4b22f81

drivers/ide/ide-acpi.c

+6 −6
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct ide_acpi_hwif_link { 
/* note: adds function name and KERN_DEBUG */

#ifdef DEBUGGING

#define DEBPRINT(fmt, args...)	\

		printk(KERN_DEBUG "%s: " fmt, __FUNCTION__, ## args)

		printk(KERN_DEBUG "%s: " fmt, __func__, ## args)

#else

#define DEBPRINT(fmt, args...)	do {} while (0)

#endif	/* DEBUGGING */
@@ -309,7 +309,7 @@ static int do_drive_get_GTF(ide_drive_t *drive, 
	if (ACPI_FAILURE(status)) {

		printk(KERN_DEBUG

		       "%s: Run _GTF error: status = 0x%x\n",

		       __FUNCTION__, status);

		       __func__, status);

		goto out;

	}
@@ -335,7 +335,7 @@ static int do_drive_get_GTF(ide_drive_t *drive, 
	    out_obj->buffer.length % REGS_PER_GTF) {

		printk(KERN_ERR

		       "%s: unexpected GTF length (%d) or addr (0x%p)\n",

		       __FUNCTION__, out_obj->buffer.length,

		       __func__, out_obj->buffer.length,

		       out_obj->buffer.pointer);

		err = -ENOENT;

		kfree(output.pointer);
@@ -384,7 +384,7 @@ static int taskfile_load_raw(ide_drive_t *drive, 
	err = ide_no_data_taskfile(drive, &args);

	if (err)

		printk(KERN_ERR "%s: ide_no_data_taskfile failed: %u\n",

		       __FUNCTION__, err);

		       __func__, err);



	return err;

}
@@ -422,7 +422,7 @@ static int do_drive_set_taskfiles(ide_drive_t *drive, 


	if (gtf_length % REGS_PER_GTF) {

		printk(KERN_ERR "%s: unexpected GTF length (%d)\n",

		       __FUNCTION__, gtf_length);

		       __func__, gtf_length);

		goto out;

	}
@@ -547,7 +547,7 @@ void ide_acpi_get_timing(ide_hwif_t *hwif) 
		printk(KERN_ERR

			"%s: unexpected _GTM length (0x%x)[should be 0x%zx] or "

			"addr (0x%p)\n",

			__FUNCTION__, out_obj->buffer.length,

			__func__, out_obj->buffer.length,

			sizeof(struct GTM_buffer), out_obj->buffer.pointer);

		return;

	}

drivers/ide/ide-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static int __ide_dma_test_irq(ide_drive_t *drive) 
		return 1;

	if (!drive->waiting_for_dma)

		printk(KERN_WARNING "%s: (%s) called while not waiting\n",

			drive->name, __FUNCTION__);

			drive->name, __func__);

	return 0;

}

#else

drivers/ide/ide-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static u8 ide_rate_filter(ide_drive_t *drive, u8 speed) 
			mode = XFER_PIO_4;

	}



//	printk("%s: mode 0x%02x, speed 0x%02x\n", __FUNCTION__, mode, speed);

/*	printk("%s: mode 0x%02x, speed 0x%02x\n", __func__, mode, speed); */



	return min(speed, mode);

}

drivers/ide/ide-probe.c

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static int ide_register_port(ide_hwif_t *hwif) 
	ret = device_register(&hwif->gendev);

	if (ret < 0) {

		printk(KERN_WARNING "IDE: %s: device_register error: %d\n",

			__FUNCTION__, ret);

			__func__, ret);

		goto out;

	}

drivers/ide/ide-proc.c

+3 −3
Original line number Diff line number Diff line
@@ -599,14 +599,14 @@ static int ide_replace_subdriver(ide_drive_t *drive, const char *driver) 
	err = device_attach(dev);

	if (err < 0)

		printk(KERN_WARNING "IDE: %s: device_attach error: %d\n",

			__FUNCTION__, err);

			__func__, err);

	drive->driver_req[0] = 0;

	if (dev->driver == NULL) {

		err = device_attach(dev);

		if (err < 0)

			printk(KERN_WARNING

				"IDE: %s: device_attach(2) error: %d\n",

				__FUNCTION__, err);

				__func__, err);

	}

	if (dev->driver && !strcmp(dev->driver->name, driver))

		ret = 0;
@@ -820,7 +820,7 @@ static int ide_drivers_show(struct seq_file *s, void *p) 
	err = bus_for_each_drv(&ide_bus_type, NULL, s, proc_print_driver);

	if (err < 0)

		printk(KERN_WARNING "IDE: %s: bus_for_each_drv error: %d\n",

			__FUNCTION__, err);

			__func__, err);

	return 0;

}