diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-03 22:09:46 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-21 00:47:09 -0400 |
commit | 66bef8c059015ba2b36bb5759080336feb01e680 (patch) | |
tree | 9060b134ba07e052bf40e0fbe641dfaa86bcbd9d /drivers/pci/hotplug/ibmphp_core.c | |
parent | ca99eb8c2d56bdfff0161388b81e641f4e039b3f (diff) |
PCI: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/hotplug/ibmphp_core.c')
-rw-r--r-- | drivers/pci/hotplug/ibmphp_core.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c index 81d009229188..c892daae74d6 100644 --- a/drivers/pci/hotplug/ibmphp_core.c +++ b/drivers/pci/hotplug/ibmphp_core.c | |||
@@ -399,7 +399,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe | |||
399 | struct slot *pslot; | 399 | struct slot *pslot; |
400 | u8 mode = 0; | 400 | u8 mode = 0; |
401 | 401 | ||
402 | debug("%s - Entry hotplug_slot[%p] pvalue[%p]\n", __FUNCTION__, | 402 | debug("%s - Entry hotplug_slot[%p] pvalue[%p]\n", __func__, |
403 | hotplug_slot, value); | 403 | hotplug_slot, value); |
404 | 404 | ||
405 | ibmphp_lock_operations(); | 405 | ibmphp_lock_operations(); |
@@ -429,7 +429,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe | |||
429 | } | 429 | } |
430 | 430 | ||
431 | ibmphp_unlock_operations(); | 431 | ibmphp_unlock_operations(); |
432 | debug("%s - Exit rc[%d] value[%x]\n", __FUNCTION__, rc, *value); | 432 | debug("%s - Exit rc[%d] value[%x]\n", __func__, rc, *value); |
433 | return rc; | 433 | return rc; |
434 | } | 434 | } |
435 | 435 | ||
@@ -439,7 +439,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe | |||
439 | struct slot *pslot; | 439 | struct slot *pslot; |
440 | u8 mode = 0; | 440 | u8 mode = 0; |
441 | 441 | ||
442 | debug("%s - Entry hotplug_slot[%p] pvalue[%p]\n", __FUNCTION__, | 442 | debug("%s - Entry hotplug_slot[%p] pvalue[%p]\n", __func__, |
443 | hotplug_slot, value); | 443 | hotplug_slot, value); |
444 | 444 | ||
445 | ibmphp_lock_operations(); | 445 | ibmphp_lock_operations(); |
@@ -475,7 +475,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe | |||
475 | } | 475 | } |
476 | 476 | ||
477 | ibmphp_unlock_operations(); | 477 | ibmphp_unlock_operations(); |
478 | debug("%s - Exit rc[%d] value[%x]\n", __FUNCTION__, rc, *value); | 478 | debug("%s - Exit rc[%d] value[%x]\n", __func__, rc, *value); |
479 | return rc; | 479 | return rc; |
480 | } | 480 | } |
481 | 481 | ||
@@ -745,13 +745,13 @@ static void free_slots(void) | |||
745 | struct list_head * tmp; | 745 | struct list_head * tmp; |
746 | struct list_head * next; | 746 | struct list_head * next; |
747 | 747 | ||
748 | debug("%s -- enter\n", __FUNCTION__); | 748 | debug("%s -- enter\n", __func__); |
749 | 749 | ||
750 | list_for_each_safe(tmp, next, &ibmphp_slot_head) { | 750 | list_for_each_safe(tmp, next, &ibmphp_slot_head) { |
751 | slot_cur = list_entry(tmp, struct slot, ibm_slot_list); | 751 | slot_cur = list_entry(tmp, struct slot, ibm_slot_list); |
752 | pci_hp_deregister(slot_cur->hotplug_slot); | 752 | pci_hp_deregister(slot_cur->hotplug_slot); |
753 | } | 753 | } |
754 | debug("%s -- exit\n", __FUNCTION__); | 754 | debug("%s -- exit\n", __func__); |
755 | } | 755 | } |
756 | 756 | ||
757 | static void ibm_unconfigure_device(struct pci_func *func) | 757 | static void ibm_unconfigure_device(struct pci_func *func) |
@@ -759,7 +759,7 @@ static void ibm_unconfigure_device(struct pci_func *func) | |||
759 | struct pci_dev *temp; | 759 | struct pci_dev *temp; |
760 | u8 j; | 760 | u8 j; |
761 | 761 | ||
762 | debug("inside %s\n", __FUNCTION__); | 762 | debug("inside %s\n", __func__); |
763 | debug("func->device = %x, func->function = %x\n", | 763 | debug("func->device = %x, func->function = %x\n", |
764 | func->device, func->function); | 764 | func->device, func->function); |
765 | debug("func->device << 3 | 0x0 = %x\n", func->device << 3 | 0x0); | 765 | debug("func->device << 3 | 0x0 = %x\n", func->device << 3 | 0x0); |
@@ -790,13 +790,13 @@ static u8 bus_structure_fixup(u8 busno) | |||
790 | 790 | ||
791 | bus = kmalloc(sizeof(*bus), GFP_KERNEL); | 791 | bus = kmalloc(sizeof(*bus), GFP_KERNEL); |
792 | if (!bus) { | 792 | if (!bus) { |
793 | err("%s - out of memory\n", __FUNCTION__); | 793 | err("%s - out of memory\n", __func__); |
794 | return 1; | 794 | return 1; |
795 | } | 795 | } |
796 | dev = kmalloc(sizeof(*dev), GFP_KERNEL); | 796 | dev = kmalloc(sizeof(*dev), GFP_KERNEL); |
797 | if (!dev) { | 797 | if (!dev) { |
798 | kfree(bus); | 798 | kfree(bus); |
799 | err("%s - out of memory\n", __FUNCTION__); | 799 | err("%s - out of memory\n", __func__); |
800 | return 1; | 800 | return 1; |
801 | } | 801 | } |
802 | 802 | ||
@@ -807,7 +807,7 @@ static u8 bus_structure_fixup(u8 busno) | |||
807 | if (!pci_read_config_word(dev, PCI_VENDOR_ID, &l) && | 807 | if (!pci_read_config_word(dev, PCI_VENDOR_ID, &l) && |
808 | (l != 0x0000) && (l != 0xffff)) { | 808 | (l != 0x0000) && (l != 0xffff)) { |
809 | debug("%s - Inside bus_struture_fixup()\n", | 809 | debug("%s - Inside bus_struture_fixup()\n", |
810 | __FUNCTION__); | 810 | __func__); |
811 | pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL); | 811 | pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL); |
812 | break; | 812 | break; |
813 | } | 813 | } |
@@ -904,7 +904,7 @@ static int set_bus(struct slot * slot_cur) | |||
904 | { }, | 904 | { }, |
905 | }; | 905 | }; |
906 | 906 | ||
907 | debug("%s - entry slot # %d\n", __FUNCTION__, slot_cur->number); | 907 | debug("%s - entry slot # %d\n", __func__, slot_cur->number); |
908 | if (SET_BUS_STATUS(slot_cur->ctrl) && is_bus_empty(slot_cur)) { | 908 | if (SET_BUS_STATUS(slot_cur->ctrl) && is_bus_empty(slot_cur)) { |
909 | rc = slot_update(&slot_cur); | 909 | rc = slot_update(&slot_cur); |
910 | if (rc) | 910 | if (rc) |
@@ -979,7 +979,7 @@ static int set_bus(struct slot * slot_cur) | |||
979 | /* This is for x440, once Brandon fixes the firmware, | 979 | /* This is for x440, once Brandon fixes the firmware, |
980 | will not need this delay */ | 980 | will not need this delay */ |
981 | msleep(1000); | 981 | msleep(1000); |
982 | debug("%s -Exit\n", __FUNCTION__); | 982 | debug("%s -Exit\n", __func__); |
983 | return 0; | 983 | return 0; |
984 | } | 984 | } |
985 | 985 | ||