diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-26 16:25:20 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 16:25:20 -0400 |
commit | eb63963a55f039f049d0dd1121f91f332af6ecc9 (patch) | |
tree | 42de9fdf101a1e45a60d43253057bc7435aef60d /drivers/ide/ide-proc.c | |
parent | c4b22f816b8ee316cff06df3880f8341e1251211 (diff) |
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: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-proc.c')
-rw-r--r-- | drivers/ide/ide-proc.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 | ||