aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/cpqphp.h
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-03 22:09:46 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-21 00:47:09 -0400
commit66bef8c059015ba2b36bb5759080336feb01e680 (patch)
tree9060b134ba07e052bf40e0fbe641dfaa86bcbd9d /drivers/pci/hotplug/cpqphp.h
parentca99eb8c2d56bdfff0161388b81e641f4e039b3f (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/cpqphp.h')
-rw-r--r--drivers/pci/hotplug/cpqphp.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/cpqphp.h b/drivers/pci/hotplug/cpqphp.h
index 298ad7f3f4f4..b1decfa88b7a 100644
--- a/drivers/pci/hotplug/cpqphp.h
+++ b/drivers/pci/hotplug/cpqphp.h
@@ -674,7 +674,7 @@ static inline int cpq_get_latch_status(struct controller *ctrl, struct slot *slo
674 674
675 hp_slot = slot->device - ctrl->slot_device_offset; 675 hp_slot = slot->device - ctrl->slot_device_offset;
676 dbg("%s: slot->device = %d, ctrl->slot_device_offset = %d \n", 676 dbg("%s: slot->device = %d, ctrl->slot_device_offset = %d \n",
677 __FUNCTION__, slot->device, ctrl->slot_device_offset); 677 __func__, slot->device, ctrl->slot_device_offset);
678 678
679 status = (readl(ctrl->hpc_reg + INT_INPUT_CLEAR) & (0x01L << hp_slot)); 679 status = (readl(ctrl->hpc_reg + INT_INPUT_CLEAR) & (0x01L << hp_slot));
680 680
@@ -709,7 +709,7 @@ static inline int wait_for_ctrl_irq(struct controller *ctrl)
709 DECLARE_WAITQUEUE(wait, current); 709 DECLARE_WAITQUEUE(wait, current);
710 int retval = 0; 710 int retval = 0;
711 711
712 dbg("%s - start\n", __FUNCTION__); 712 dbg("%s - start\n", __func__);
713 add_wait_queue(&ctrl->queue, &wait); 713 add_wait_queue(&ctrl->queue, &wait);
714 /* Sleep for up to 1 second to wait for the LED to change. */ 714 /* Sleep for up to 1 second to wait for the LED to change. */
715 msleep_interruptible(1000); 715 msleep_interruptible(1000);
@@ -717,7 +717,7 @@ static inline int wait_for_ctrl_irq(struct controller *ctrl)
717 if (signal_pending(current)) 717 if (signal_pending(current))
718 retval = -EINTR; 718 retval = -EINTR;
719 719
720 dbg("%s - end\n", __FUNCTION__); 720 dbg("%s - end\n", __func__);
721 return retval; 721 return retval;
722} 722}
723 723