aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-acpi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-acpi.c')
-rw-r--r--drivers/ide/ide-acpi.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index 0f6fb6b72dd9..e4ad26e4fce7 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -55,7 +55,7 @@ struct ide_acpi_hwif_link {
55/* note: adds function name and KERN_DEBUG */ 55/* note: adds function name and KERN_DEBUG */
56#ifdef DEBUGGING 56#ifdef DEBUGGING
57#define DEBPRINT(fmt, args...) \ 57#define DEBPRINT(fmt, args...) \
58 printk(KERN_DEBUG "%s: " fmt, __FUNCTION__, ## args) 58 printk(KERN_DEBUG "%s: " fmt, __func__, ## args)
59#else 59#else
60#define DEBPRINT(fmt, args...) do {} while (0) 60#define DEBPRINT(fmt, args...) do {} while (0)
61#endif /* DEBUGGING */ 61#endif /* DEBUGGING */
@@ -309,7 +309,7 @@ static int do_drive_get_GTF(ide_drive_t *drive,
309 if (ACPI_FAILURE(status)) { 309 if (ACPI_FAILURE(status)) {
310 printk(KERN_DEBUG 310 printk(KERN_DEBUG
311 "%s: Run _GTF error: status = 0x%x\n", 311 "%s: Run _GTF error: status = 0x%x\n",
312 __FUNCTION__, status); 312 __func__, status);
313 goto out; 313 goto out;
314 } 314 }
315 315
@@ -335,7 +335,7 @@ static int do_drive_get_GTF(ide_drive_t *drive,
335 out_obj->buffer.length % REGS_PER_GTF) { 335 out_obj->buffer.length % REGS_PER_GTF) {
336 printk(KERN_ERR 336 printk(KERN_ERR
337 "%s: unexpected GTF length (%d) or addr (0x%p)\n", 337 "%s: unexpected GTF length (%d) or addr (0x%p)\n",
338 __FUNCTION__, out_obj->buffer.length, 338 __func__, out_obj->buffer.length,
339 out_obj->buffer.pointer); 339 out_obj->buffer.pointer);
340 err = -ENOENT; 340 err = -ENOENT;
341 kfree(output.pointer); 341 kfree(output.pointer);
@@ -384,7 +384,7 @@ static int taskfile_load_raw(ide_drive_t *drive,
384 err = ide_no_data_taskfile(drive, &args); 384 err = ide_no_data_taskfile(drive, &args);
385 if (err) 385 if (err)
386 printk(KERN_ERR "%s: ide_no_data_taskfile failed: %u\n", 386 printk(KERN_ERR "%s: ide_no_data_taskfile failed: %u\n",
387 __FUNCTION__, err); 387 __func__, err);
388 388
389 return err; 389 return err;
390} 390}
@@ -422,7 +422,7 @@ static int do_drive_set_taskfiles(ide_drive_t *drive,
422 422
423 if (gtf_length % REGS_PER_GTF) { 423 if (gtf_length % REGS_PER_GTF) {
424 printk(KERN_ERR "%s: unexpected GTF length (%d)\n", 424 printk(KERN_ERR "%s: unexpected GTF length (%d)\n",
425 __FUNCTION__, gtf_length); 425 __func__, gtf_length);
426 goto out; 426 goto out;
427 } 427 }
428 428
@@ -547,7 +547,7 @@ void ide_acpi_get_timing(ide_hwif_t *hwif)
547 printk(KERN_ERR 547 printk(KERN_ERR
548 "%s: unexpected _GTM length (0x%x)[should be 0x%zx] or " 548 "%s: unexpected _GTM length (0x%x)[should be 0x%zx] or "
549 "addr (0x%p)\n", 549 "addr (0x%p)\n",
550 __FUNCTION__, out_obj->buffer.length, 550 __func__, out_obj->buffer.length,
551 sizeof(struct GTM_buffer), out_obj->buffer.pointer); 551 sizeof(struct GTM_buffer), out_obj->buffer.pointer);
552 return; 552 return;
553 } 553 }