diff options
-rw-r--r-- | drivers/ide/ide-acpi.c | 12 | ||||
-rw-r--r-- | drivers/ide/ide-dma.c | 2 | ||||
-rw-r--r-- | drivers/ide/ide-lib.c | 2 | ||||
-rw-r--r-- | drivers/ide/ide-probe.c | 2 | ||||
-rw-r--r-- | drivers/ide/ide-proc.c | 6 | ||||
-rw-r--r-- | drivers/ide/ide-scan-pci.c | 2 | ||||
-rw-r--r-- | drivers/ide/ide-taskfile.c | 12 | ||||
-rw-r--r-- | drivers/ide/legacy/ht6560b.c | 4 | ||||
-rw-r--r-- | drivers/ide/mips/au1xxx-ide.c | 8 | ||||
-rw-r--r-- | drivers/ide/pci/hpt366.c | 4 | ||||
-rw-r--r-- | drivers/ide/pci/pdc202xx_new.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/scc_pata.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/sgiioc4.c | 26 | ||||
-rw-r--r-- | drivers/ide/pci/siimage.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/sl82c105.c | 4 | ||||
-rw-r--r-- | drivers/ide/ppc/mpc8xx.c | 2 |
16 files changed, 46 insertions, 46 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 | } |
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 986ec465cb77..3cdb0749ada4 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -542,7 +542,7 @@ static int __ide_dma_test_irq(ide_drive_t *drive) | |||
542 | return 1; | 542 | return 1; |
543 | if (!drive->waiting_for_dma) | 543 | if (!drive->waiting_for_dma) |
544 | printk(KERN_WARNING "%s: (%s) called while not waiting\n", | 544 | printk(KERN_WARNING "%s: (%s) called while not waiting\n", |
545 | drive->name, __FUNCTION__); | 545 | drive->name, __func__); |
546 | return 0; | 546 | return 0; |
547 | } | 547 | } |
548 | #else | 548 | #else |
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c index 46443f163154..6f04ea3e93a8 100644 --- a/drivers/ide/ide-lib.c +++ b/drivers/ide/ide-lib.c | |||
@@ -85,7 +85,7 @@ static u8 ide_rate_filter(ide_drive_t *drive, u8 speed) | |||
85 | mode = XFER_PIO_4; | 85 | mode = XFER_PIO_4; |
86 | } | 86 | } |
87 | 87 | ||
88 | // printk("%s: mode 0x%02x, speed 0x%02x\n", __FUNCTION__, mode, speed); | 88 | /* printk("%s: mode 0x%02x, speed 0x%02x\n", __func__, mode, speed); */ |
89 | 89 | ||
90 | return min(speed, mode); | 90 | return min(speed, mode); |
91 | } | 91 | } |
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index c2cdeefb016c..d2faef17e548 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -644,7 +644,7 @@ static int ide_register_port(ide_hwif_t *hwif) | |||
644 | ret = device_register(&hwif->gendev); | 644 | ret = device_register(&hwif->gendev); |
645 | if (ret < 0) { | 645 | if (ret < 0) { |
646 | printk(KERN_WARNING "IDE: %s: device_register error: %d\n", | 646 | printk(KERN_WARNING "IDE: %s: device_register error: %d\n", |
647 | __FUNCTION__, ret); | 647 | __func__, ret); |
648 | goto out; | 648 | goto out; |
649 | } | 649 | } |
650 | 650 | ||
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index 5d3562b45039..d9d98ac85b29 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c | |||
@@ -599,14 +599,14 @@ static int ide_replace_subdriver(ide_drive_t *drive, const char *driver) | |||
599 | err = device_attach(dev); | 599 | err = device_attach(dev); |
600 | if (err < 0) | 600 | if (err < 0) |
601 | printk(KERN_WARNING "IDE: %s: device_attach error: %d\n", | 601 | printk(KERN_WARNING "IDE: %s: device_attach error: %d\n", |
602 | __FUNCTION__, err); | 602 | __func__, err); |
603 | drive->driver_req[0] = 0; | 603 | drive->driver_req[0] = 0; |
604 | if (dev->driver == NULL) { | 604 | if (dev->driver == NULL) { |
605 | err = device_attach(dev); | 605 | err = device_attach(dev); |
606 | if (err < 0) | 606 | if (err < 0) |
607 | printk(KERN_WARNING | 607 | printk(KERN_WARNING |
608 | "IDE: %s: device_attach(2) error: %d\n", | 608 | "IDE: %s: device_attach(2) error: %d\n", |
609 | __FUNCTION__, err); | 609 | __func__, err); |
610 | } | 610 | } |
611 | if (dev->driver && !strcmp(dev->driver->name, driver)) | 611 | if (dev->driver && !strcmp(dev->driver->name, driver)) |
612 | ret = 0; | 612 | ret = 0; |
@@ -820,7 +820,7 @@ static int ide_drivers_show(struct seq_file *s, void *p) | |||
820 | err = bus_for_each_drv(&ide_bus_type, NULL, s, proc_print_driver); | 820 | err = bus_for_each_drv(&ide_bus_type, NULL, s, proc_print_driver); |
821 | if (err < 0) | 821 | if (err < 0) |
822 | printk(KERN_WARNING "IDE: %s: bus_for_each_drv error: %d\n", | 822 | printk(KERN_WARNING "IDE: %s: bus_for_each_drv error: %d\n", |
823 | __FUNCTION__, err); | 823 | __func__, err); |
824 | return 0; | 824 | return 0; |
825 | } | 825 | } |
826 | 826 | ||
diff --git a/drivers/ide/ide-scan-pci.c b/drivers/ide/ide-scan-pci.c index 98888da1b600..0e79efff1deb 100644 --- a/drivers/ide/ide-scan-pci.c +++ b/drivers/ide/ide-scan-pci.c | |||
@@ -102,7 +102,7 @@ static int __init ide_scan_pcibus(void) | |||
102 | if (__pci_register_driver(d, d->driver.owner, | 102 | if (__pci_register_driver(d, d->driver.owner, |
103 | d->driver.mod_name)) | 103 | d->driver.mod_name)) |
104 | printk(KERN_ERR "%s: failed to register %s driver\n", | 104 | printk(KERN_ERR "%s: failed to register %s driver\n", |
105 | __FUNCTION__, d->driver.mod_name); | 105 | __func__, d->driver.mod_name); |
106 | } | 106 | } |
107 | 107 | ||
108 | return 0; | 108 | return 0; |
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 155cc904f4eb..fac6835273a8 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
@@ -455,7 +455,7 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive) | |||
455 | 455 | ||
456 | /* Error? */ | 456 | /* Error? */ |
457 | if (stat & ERR_STAT) | 457 | if (stat & ERR_STAT) |
458 | return task_error(drive, rq, __FUNCTION__, stat); | 458 | return task_error(drive, rq, __func__, stat); |
459 | 459 | ||
460 | /* Didn't want any data? Odd. */ | 460 | /* Didn't want any data? Odd. */ |
461 | if (!(stat & DRQ_STAT)) | 461 | if (!(stat & DRQ_STAT)) |
@@ -467,7 +467,7 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive) | |||
467 | if (!hwif->nleft) { | 467 | if (!hwif->nleft) { |
468 | stat = wait_drive_not_busy(drive); | 468 | stat = wait_drive_not_busy(drive); |
469 | if (!OK_STAT(stat, 0, BAD_STAT)) | 469 | if (!OK_STAT(stat, 0, BAD_STAT)) |
470 | return task_error(drive, rq, __FUNCTION__, stat); | 470 | return task_error(drive, rq, __func__, stat); |
471 | task_end_request(drive, rq, stat); | 471 | task_end_request(drive, rq, stat); |
472 | return ide_stopped; | 472 | return ide_stopped; |
473 | } | 473 | } |
@@ -488,11 +488,11 @@ static ide_startstop_t task_out_intr (ide_drive_t *drive) | |||
488 | u8 stat = ide_read_status(drive); | 488 | u8 stat = ide_read_status(drive); |
489 | 489 | ||
490 | if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat)) | 490 | if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat)) |
491 | return task_error(drive, rq, __FUNCTION__, stat); | 491 | return task_error(drive, rq, __func__, stat); |
492 | 492 | ||
493 | /* Deal with unexpected ATA data phase. */ | 493 | /* Deal with unexpected ATA data phase. */ |
494 | if (((stat & DRQ_STAT) == 0) ^ !hwif->nleft) | 494 | if (((stat & DRQ_STAT) == 0) ^ !hwif->nleft) |
495 | return task_error(drive, rq, __FUNCTION__, stat); | 495 | return task_error(drive, rq, __func__, stat); |
496 | 496 | ||
497 | if (!hwif->nleft) { | 497 | if (!hwif->nleft) { |
498 | task_end_request(drive, rq, stat); | 498 | task_end_request(drive, rq, stat); |
@@ -675,7 +675,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg) | |||
675 | /* (hs): give up if multcount is not set */ | 675 | /* (hs): give up if multcount is not set */ |
676 | printk(KERN_ERR "%s: %s Multimode Write " \ | 676 | printk(KERN_ERR "%s: %s Multimode Write " \ |
677 | "multcount is not set\n", | 677 | "multcount is not set\n", |
678 | drive->name, __FUNCTION__); | 678 | drive->name, __func__); |
679 | err = -EPERM; | 679 | err = -EPERM; |
680 | goto abort; | 680 | goto abort; |
681 | } | 681 | } |
@@ -692,7 +692,7 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg) | |||
692 | /* (hs): give up if multcount is not set */ | 692 | /* (hs): give up if multcount is not set */ |
693 | printk(KERN_ERR "%s: %s Multimode Read failure " \ | 693 | printk(KERN_ERR "%s: %s Multimode Read failure " \ |
694 | "multcount is not set\n", | 694 | "multcount is not set\n", |
695 | drive->name, __FUNCTION__); | 695 | drive->name, __func__); |
696 | err = -EPERM; | 696 | err = -EPERM; |
697 | goto abort; | 697 | goto abort; |
698 | } | 698 | } |
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c index 971960ee7c03..702d8deb5780 100644 --- a/drivers/ide/legacy/ht6560b.c +++ b/drivers/ide/legacy/ht6560b.c | |||
@@ -352,12 +352,12 @@ static int __init ht6560b_init(void) | |||
352 | 352 | ||
353 | if (!request_region(HT_CONFIG_PORT, 1, DRV_NAME)) { | 353 | if (!request_region(HT_CONFIG_PORT, 1, DRV_NAME)) { |
354 | printk(KERN_NOTICE "%s: HT_CONFIG_PORT not found\n", | 354 | printk(KERN_NOTICE "%s: HT_CONFIG_PORT not found\n", |
355 | __FUNCTION__); | 355 | __func__); |
356 | return -ENODEV; | 356 | return -ENODEV; |
357 | } | 357 | } |
358 | 358 | ||
359 | if (!try_to_init_ht6560b()) { | 359 | if (!try_to_init_ht6560b()) { |
360 | printk(KERN_NOTICE "%s: HBA not found\n", __FUNCTION__); | 360 | printk(KERN_NOTICE "%s: HBA not found\n", __func__); |
361 | goto release_region; | 361 | goto release_region; |
362 | } | 362 | } |
363 | 363 | ||
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index e539977b3348..7179d4953211 100644 --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c | |||
@@ -61,7 +61,7 @@ void auide_insw(unsigned long port, void *addr, u32 count) | |||
61 | 61 | ||
62 | if(!put_dest_flags(ahwif->rx_chan, (void*)addr, count << 1, | 62 | if(!put_dest_flags(ahwif->rx_chan, (void*)addr, count << 1, |
63 | DDMA_FLAGS_NOIE)) { | 63 | DDMA_FLAGS_NOIE)) { |
64 | printk(KERN_ERR "%s failed %d\n", __FUNCTION__, __LINE__); | 64 | printk(KERN_ERR "%s failed %d\n", __func__, __LINE__); |
65 | return; | 65 | return; |
66 | } | 66 | } |
67 | ctp = *((chan_tab_t **)ahwif->rx_chan); | 67 | ctp = *((chan_tab_t **)ahwif->rx_chan); |
@@ -79,7 +79,7 @@ void auide_outsw(unsigned long port, void *addr, u32 count) | |||
79 | 79 | ||
80 | if(!put_source_flags(ahwif->tx_chan, (void*)addr, | 80 | if(!put_source_flags(ahwif->tx_chan, (void*)addr, |
81 | count << 1, DDMA_FLAGS_NOIE)) { | 81 | count << 1, DDMA_FLAGS_NOIE)) { |
82 | printk(KERN_ERR "%s failed %d\n", __FUNCTION__, __LINE__); | 82 | printk(KERN_ERR "%s failed %d\n", __func__, __LINE__); |
83 | return; | 83 | return; |
84 | } | 84 | } |
85 | ctp = *((chan_tab_t **)ahwif->tx_chan); | 85 | ctp = *((chan_tab_t **)ahwif->tx_chan); |
@@ -250,7 +250,7 @@ static int auide_build_dmatable(ide_drive_t *drive) | |||
250 | (void*) sg_virt(sg), | 250 | (void*) sg_virt(sg), |
251 | tc, flags)) { | 251 | tc, flags)) { |
252 | printk(KERN_ERR "%s failed %d\n", | 252 | printk(KERN_ERR "%s failed %d\n", |
253 | __FUNCTION__, __LINE__); | 253 | __func__, __LINE__); |
254 | } | 254 | } |
255 | } else | 255 | } else |
256 | { | 256 | { |
@@ -258,7 +258,7 @@ static int auide_build_dmatable(ide_drive_t *drive) | |||
258 | (void*) sg_virt(sg), | 258 | (void*) sg_virt(sg), |
259 | tc, flags)) { | 259 | tc, flags)) { |
260 | printk(KERN_ERR "%s failed %d\n", | 260 | printk(KERN_ERR "%s failed %d\n", |
261 | __FUNCTION__, __LINE__); | 261 | __func__, __LINE__); |
262 | } | 262 | } |
263 | } | 263 | } |
264 | 264 | ||
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 1592dbf6c5cb..ec77a7a5c61f 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
@@ -776,7 +776,7 @@ static void hpt366_dma_lost_irq(ide_drive_t *drive) | |||
776 | pci_read_config_byte(dev, 0x52, &mcr3); | 776 | pci_read_config_byte(dev, 0x52, &mcr3); |
777 | pci_read_config_byte(dev, 0x5a, &scr1); | 777 | pci_read_config_byte(dev, 0x5a, &scr1); |
778 | printk("%s: (%s) mcr1=0x%02x, mcr3=0x%02x, scr1=0x%02x\n", | 778 | printk("%s: (%s) mcr1=0x%02x, mcr3=0x%02x, scr1=0x%02x\n", |
779 | drive->name, __FUNCTION__, mcr1, mcr3, scr1); | 779 | drive->name, __func__, mcr1, mcr3, scr1); |
780 | if (scr1 & 0x10) | 780 | if (scr1 & 0x10) |
781 | pci_write_config_byte(dev, 0x5a, scr1 & ~0x10); | 781 | pci_write_config_byte(dev, 0x5a, scr1 & ~0x10); |
782 | ide_dma_lost_irq(drive); | 782 | ide_dma_lost_irq(drive); |
@@ -858,7 +858,7 @@ static int hpt374_ide_dma_test_irq(ide_drive_t *drive) | |||
858 | 858 | ||
859 | if (!drive->waiting_for_dma) | 859 | if (!drive->waiting_for_dma) |
860 | printk(KERN_WARNING "%s: (%s) called while not waiting\n", | 860 | printk(KERN_WARNING "%s: (%s) called while not waiting\n", |
861 | drive->name, __FUNCTION__); | 861 | drive->name, __func__); |
862 | return 0; | 862 | return 0; |
863 | } | 863 | } |
864 | 864 | ||
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index 35a249cfe03f..ec9bd7b352fc 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #undef DEBUG | 34 | #undef DEBUG |
35 | 35 | ||
36 | #ifdef DEBUG | 36 | #ifdef DEBUG |
37 | #define DBG(fmt, args...) printk("%s: " fmt, __FUNCTION__, ## args) | 37 | #define DBG(fmt, args...) printk("%s: " fmt, __func__, ## args) |
38 | #else | 38 | #else |
39 | #define DBG(fmt, args...) | 39 | #define DBG(fmt, args...) |
40 | #endif | 40 | #endif |
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c index 41a993f3ded2..e7f8ebc94b05 100644 --- a/drivers/ide/pci/scc_pata.c +++ b/drivers/ide/pci/scc_pata.c | |||
@@ -449,7 +449,7 @@ static int scc_dma_test_irq(ide_drive_t *drive) | |||
449 | 449 | ||
450 | if (!drive->waiting_for_dma) | 450 | if (!drive->waiting_for_dma) |
451 | printk(KERN_WARNING "%s: (%s) called while not waiting\n", | 451 | printk(KERN_WARNING "%s: (%s) called while not waiting\n", |
452 | drive->name, __FUNCTION__); | 452 | drive->name, __func__); |
453 | return 0; | 453 | return 0; |
454 | } | 454 | } |
455 | 455 | ||
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index e16597ddbd91..ec48decb1744 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -170,10 +170,10 @@ sgiioc4_clearirq(ide_drive_t * drive) | |||
170 | printk(KERN_ERR | 170 | printk(KERN_ERR |
171 | "%s(%s) : PCI Bus Error when doing DMA:" | 171 | "%s(%s) : PCI Bus Error when doing DMA:" |
172 | " status-cmd reg is 0x%x\n", | 172 | " status-cmd reg is 0x%x\n", |
173 | __FUNCTION__, drive->name, pci_stat_cmd_reg); | 173 | __func__, drive->name, pci_stat_cmd_reg); |
174 | printk(KERN_ERR | 174 | printk(KERN_ERR |
175 | "%s(%s) : PCI Error Address is 0x%x%x\n", | 175 | "%s(%s) : PCI Error Address is 0x%x%x\n", |
176 | __FUNCTION__, drive->name, | 176 | __func__, drive->name, |
177 | pci_err_addr_high, pci_err_addr_low); | 177 | pci_err_addr_high, pci_err_addr_low); |
178 | /* Clear the PCI Error indicator */ | 178 | /* Clear the PCI Error indicator */ |
179 | pci_write_config_dword(dev, PCI_COMMAND, 0x00000146); | 179 | pci_write_config_dword(dev, PCI_COMMAND, 0x00000146); |
@@ -232,7 +232,7 @@ sgiioc4_ide_dma_end(ide_drive_t * drive) | |||
232 | printk(KERN_ERR | 232 | printk(KERN_ERR |
233 | "%s(%s): IOC4 DMA STOP bit is still 1 :" | 233 | "%s(%s): IOC4 DMA STOP bit is still 1 :" |
234 | "ioc4_dma_reg 0x%x\n", | 234 | "ioc4_dma_reg 0x%x\n", |
235 | __FUNCTION__, drive->name, ioc4_dma); | 235 | __func__, drive->name, ioc4_dma); |
236 | dma_stat = 1; | 236 | dma_stat = 1; |
237 | } | 237 | } |
238 | 238 | ||
@@ -251,7 +251,7 @@ sgiioc4_ide_dma_end(ide_drive_t * drive) | |||
251 | udelay(1); | 251 | udelay(1); |
252 | } | 252 | } |
253 | if (!valid) { | 253 | if (!valid) { |
254 | printk(KERN_ERR "%s(%s) : DMA incomplete\n", __FUNCTION__, | 254 | printk(KERN_ERR "%s(%s) : DMA incomplete\n", __func__, |
255 | drive->name); | 255 | drive->name); |
256 | dma_stat = 1; | 256 | dma_stat = 1; |
257 | } | 257 | } |
@@ -264,7 +264,7 @@ sgiioc4_ide_dma_end(ide_drive_t * drive) | |||
264 | printk(KERN_ERR | 264 | printk(KERN_ERR |
265 | "%s(%s): WARNING!! byte_count_dev %d " | 265 | "%s(%s): WARNING!! byte_count_dev %d " |
266 | "!= byte_count_mem %d\n", | 266 | "!= byte_count_mem %d\n", |
267 | __FUNCTION__, drive->name, bc_dev, bc_mem); | 267 | __func__, drive->name, bc_dev, bc_mem); |
268 | } | 268 | } |
269 | } | 269 | } |
270 | 270 | ||
@@ -343,7 +343,7 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base) | |||
343 | printk(KERN_ERR | 343 | printk(KERN_ERR |
344 | "%s(%s) -- ERROR, Addresses 0x%p to 0x%p " | 344 | "%s(%s) -- ERROR, Addresses 0x%p to 0x%p " |
345 | "ALREADY in use\n", | 345 | "ALREADY in use\n", |
346 | __FUNCTION__, hwif->name, (void *) dma_base, | 346 | __func__, hwif->name, (void *) dma_base, |
347 | (void *) dma_base + num_ports - 1); | 347 | (void *) dma_base + num_ports - 1); |
348 | return -1; | 348 | return -1; |
349 | } | 349 | } |
@@ -352,7 +352,7 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base) | |||
352 | if (virt_dma_base == NULL) { | 352 | if (virt_dma_base == NULL) { |
353 | printk(KERN_ERR | 353 | printk(KERN_ERR |
354 | "%s(%s) -- ERROR, Unable to map addresses 0x%lx to 0x%lx\n", | 354 | "%s(%s) -- ERROR, Unable to map addresses 0x%lx to 0x%lx\n", |
355 | __FUNCTION__, hwif->name, dma_base, dma_base + num_ports - 1); | 355 | __func__, hwif->name, dma_base, dma_base + num_ports - 1); |
356 | goto dma_remap_failure; | 356 | goto dma_remap_failure; |
357 | } | 357 | } |
358 | hwif->dma_base = (unsigned long) virt_dma_base; | 358 | hwif->dma_base = (unsigned long) virt_dma_base; |
@@ -378,7 +378,7 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base) | |||
378 | hwif->dmatable_cpu, hwif->dmatable_dma); | 378 | hwif->dmatable_cpu, hwif->dmatable_dma); |
379 | printk(KERN_INFO | 379 | printk(KERN_INFO |
380 | "%s() -- Error! Unable to allocate DMA Maps for drive %s\n", | 380 | "%s() -- Error! Unable to allocate DMA Maps for drive %s\n", |
381 | __FUNCTION__, hwif->name); | 381 | __func__, hwif->name); |
382 | printk(KERN_INFO | 382 | printk(KERN_INFO |
383 | "Changing from DMA to PIO mode for Drive %s\n", hwif->name); | 383 | "Changing from DMA to PIO mode for Drive %s\n", hwif->name); |
384 | 384 | ||
@@ -406,14 +406,14 @@ sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive) | |||
406 | if (ioc4_dma & IOC4_S_DMA_ACTIVE) { | 406 | if (ioc4_dma & IOC4_S_DMA_ACTIVE) { |
407 | printk(KERN_WARNING | 407 | printk(KERN_WARNING |
408 | "%s(%s):Warning!! DMA from previous transfer was still active\n", | 408 | "%s(%s):Warning!! DMA from previous transfer was still active\n", |
409 | __FUNCTION__, drive->name); | 409 | __func__, drive->name); |
410 | writel(IOC4_S_DMA_STOP, (void __iomem *)ioc4_dma_addr); | 410 | writel(IOC4_S_DMA_STOP, (void __iomem *)ioc4_dma_addr); |
411 | ioc4_dma = sgiioc4_ide_dma_stop(hwif, dma_base); | 411 | ioc4_dma = sgiioc4_ide_dma_stop(hwif, dma_base); |
412 | 412 | ||
413 | if (ioc4_dma & IOC4_S_DMA_STOP) | 413 | if (ioc4_dma & IOC4_S_DMA_STOP) |
414 | printk(KERN_ERR | 414 | printk(KERN_ERR |
415 | "%s(%s) : IOC4 Dma STOP bit is still 1\n", | 415 | "%s(%s) : IOC4 Dma STOP bit is still 1\n", |
416 | __FUNCTION__, drive->name); | 416 | __func__, drive->name); |
417 | } | 417 | } |
418 | 418 | ||
419 | ioc4_dma = readl((void __iomem *)ioc4_dma_addr); | 419 | ioc4_dma = readl((void __iomem *)ioc4_dma_addr); |
@@ -421,14 +421,14 @@ sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive) | |||
421 | printk(KERN_WARNING | 421 | printk(KERN_WARNING |
422 | "%s(%s) : Warning!! - DMA Error during Previous" | 422 | "%s(%s) : Warning!! - DMA Error during Previous" |
423 | " transfer | status 0x%x\n", | 423 | " transfer | status 0x%x\n", |
424 | __FUNCTION__, drive->name, ioc4_dma); | 424 | __func__, drive->name, ioc4_dma); |
425 | writel(IOC4_S_DMA_STOP, (void __iomem *)ioc4_dma_addr); | 425 | writel(IOC4_S_DMA_STOP, (void __iomem *)ioc4_dma_addr); |
426 | ioc4_dma = sgiioc4_ide_dma_stop(hwif, dma_base); | 426 | ioc4_dma = sgiioc4_ide_dma_stop(hwif, dma_base); |
427 | 427 | ||
428 | if (ioc4_dma & IOC4_S_DMA_STOP) | 428 | if (ioc4_dma & IOC4_S_DMA_STOP) |
429 | printk(KERN_ERR | 429 | printk(KERN_ERR |
430 | "%s(%s) : IOC4 DMA STOP bit is still 1\n", | 430 | "%s(%s) : IOC4 DMA STOP bit is still 1\n", |
431 | __FUNCTION__, drive->name); | 431 | __func__, drive->name); |
432 | } | 432 | } |
433 | 433 | ||
434 | /* Address of the Scatter Gather List */ | 434 | /* Address of the Scatter Gather List */ |
@@ -618,7 +618,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) | |||
618 | printk(KERN_ERR | 618 | printk(KERN_ERR |
619 | "%s : %s -- ERROR, Addresses " | 619 | "%s : %s -- ERROR, Addresses " |
620 | "0x%p to 0x%p ALREADY in use\n", | 620 | "0x%p to 0x%p ALREADY in use\n", |
621 | __FUNCTION__, hwif->name, (void *) cmd_phys_base, | 621 | __func__, hwif->name, (void *) cmd_phys_base, |
622 | (void *) cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE); | 622 | (void *) cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE); |
623 | return -ENOMEM; | 623 | return -ENOMEM; |
624 | } | 624 | } |
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 3e4b99380709..faf5c3d6ab72 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -347,7 +347,7 @@ static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive) | |||
347 | printk(KERN_WARNING "%s: sata_error = 0x%08x, " | 347 | printk(KERN_WARNING "%s: sata_error = 0x%08x, " |
348 | "watchdog = %d, %s\n", | 348 | "watchdog = %d, %s\n", |
349 | drive->name, sata_error, watchdog, | 349 | drive->name, sata_error, watchdog, |
350 | __FUNCTION__); | 350 | __func__); |
351 | 351 | ||
352 | } else { | 352 | } else { |
353 | watchdog = (ext_stat & 0x8000) ? 1 : 0; | 353 | watchdog = (ext_stat & 0x8000) ? 1 : 0; |
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c index 66817fe1eeae..8ac4e62bf1f4 100644 --- a/drivers/ide/pci/sl82c105.c +++ b/drivers/ide/pci/sl82c105.c | |||
@@ -179,7 +179,7 @@ static void sl82c105_dma_start(ide_drive_t *drive) | |||
179 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 179 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
180 | int reg = 0x44 + drive->dn * 4; | 180 | int reg = 0x44 + drive->dn * 4; |
181 | 181 | ||
182 | DBG(("%s(drive:%s)\n", __FUNCTION__, drive->name)); | 182 | DBG(("%s(drive:%s)\n", __func__, drive->name)); |
183 | 183 | ||
184 | pci_write_config_word(dev, reg, drive->drive_data >> 16); | 184 | pci_write_config_word(dev, reg, drive->drive_data >> 16); |
185 | 185 | ||
@@ -203,7 +203,7 @@ static int sl82c105_dma_end(ide_drive_t *drive) | |||
203 | int reg = 0x44 + drive->dn * 4; | 203 | int reg = 0x44 + drive->dn * 4; |
204 | int ret; | 204 | int ret; |
205 | 205 | ||
206 | DBG(("%s(drive:%s)\n", __FUNCTION__, drive->name)); | 206 | DBG(("%s(drive:%s)\n", __func__, drive->name)); |
207 | 207 | ||
208 | ret = __ide_dma_end(drive); | 208 | ret = __ide_dma_end(drive); |
209 | 209 | ||
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c index 6d62adefd976..a82f6efb660b 100644 --- a/drivers/ide/ppc/mpc8xx.c +++ b/drivers/ide/ppc/mpc8xx.c | |||
@@ -438,7 +438,7 @@ static void m8xx_ide_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
438 | #elif defined(CONFIG_IDE_EXT_DIRECT) | 438 | #elif defined(CONFIG_IDE_EXT_DIRECT) |
439 | 439 | ||
440 | printk("%s[%d] %s: not implemented yet!\n", | 440 | printk("%s[%d] %s: not implemented yet!\n", |
441 | __FILE__,__LINE__,__FUNCTION__); | 441 | __FILE__, __LINE__, __func__); |
442 | #endif /* defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_PCMCIA */ | 442 | #endif /* defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_PCMCIA */ |
443 | } | 443 | } |
444 | 444 | ||