diff options
Diffstat (limited to 'drivers/pci/hotplug/rpaphp_pci.c')
-rw-r--r-- | drivers/pci/hotplug/rpaphp_pci.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c index 6571e9b4c2ec..5acfd4f3d4cb 100644 --- a/drivers/pci/hotplug/rpaphp_pci.c +++ b/drivers/pci/hotplug/rpaphp_pci.c | |||
@@ -42,7 +42,7 @@ int rpaphp_get_sensor_state(struct slot *slot, int *state) | |||
42 | if (rc < 0) { | 42 | if (rc < 0) { |
43 | if (rc == -EFAULT || rc == -EEXIST) { | 43 | if (rc == -EFAULT || rc == -EEXIST) { |
44 | dbg("%s: slot must be power up to get sensor-state\n", | 44 | dbg("%s: slot must be power up to get sensor-state\n", |
45 | __FUNCTION__); | 45 | __func__); |
46 | 46 | ||
47 | /* some slots have to be powered up | 47 | /* some slots have to be powered up |
48 | * before get-sensor will succeed. | 48 | * before get-sensor will succeed. |
@@ -51,15 +51,15 @@ int rpaphp_get_sensor_state(struct slot *slot, int *state) | |||
51 | &setlevel); | 51 | &setlevel); |
52 | if (rc < 0) { | 52 | if (rc < 0) { |
53 | dbg("%s: power on slot[%s] failed rc=%d.\n", | 53 | dbg("%s: power on slot[%s] failed rc=%d.\n", |
54 | __FUNCTION__, slot->name, rc); | 54 | __func__, slot->name, rc); |
55 | } else { | 55 | } else { |
56 | rc = rtas_get_sensor(DR_ENTITY_SENSE, | 56 | rc = rtas_get_sensor(DR_ENTITY_SENSE, |
57 | slot->index, state); | 57 | slot->index, state); |
58 | } | 58 | } |
59 | } else if (rc == -ENODEV) | 59 | } else if (rc == -ENODEV) |
60 | info("%s: slot is unusable\n", __FUNCTION__); | 60 | info("%s: slot is unusable\n", __func__); |
61 | else | 61 | else |
62 | err("%s failed to get sensor state\n", __FUNCTION__); | 62 | err("%s failed to get sensor state\n", __func__); |
63 | } | 63 | } |
64 | return rc; | 64 | return rc; |
65 | } | 65 | } |
@@ -95,7 +95,7 @@ int rpaphp_enable_slot(struct slot *slot) | |||
95 | 95 | ||
96 | bus = pcibios_find_pci_bus(slot->dn); | 96 | bus = pcibios_find_pci_bus(slot->dn); |
97 | if (!bus) { | 97 | if (!bus) { |
98 | err("%s: no pci_bus for dn %s\n", __FUNCTION__, slot->dn->full_name); | 98 | err("%s: no pci_bus for dn %s\n", __func__, slot->dn->full_name); |
99 | return -EINVAL; | 99 | return -EINVAL; |
100 | } | 100 | } |
101 | 101 | ||
@@ -111,7 +111,7 @@ int rpaphp_enable_slot(struct slot *slot) | |||
111 | /* non-empty slot has to have child */ | 111 | /* non-empty slot has to have child */ |
112 | if (!slot->dn->child) { | 112 | if (!slot->dn->child) { |
113 | err("%s: slot[%s]'s device_node doesn't have child for adapter\n", | 113 | err("%s: slot[%s]'s device_node doesn't have child for adapter\n", |
114 | __FUNCTION__, slot->name); | 114 | __func__, slot->name); |
115 | return -EINVAL; | 115 | return -EINVAL; |
116 | } | 116 | } |
117 | 117 | ||
@@ -125,7 +125,7 @@ int rpaphp_enable_slot(struct slot *slot) | |||
125 | 125 | ||
126 | if (debug) { | 126 | if (debug) { |
127 | struct pci_dev *dev; | 127 | struct pci_dev *dev; |
128 | dbg("%s: pci_devs of slot[%s]\n", __FUNCTION__, slot->dn->full_name); | 128 | dbg("%s: pci_devs of slot[%s]\n", __func__, slot->dn->full_name); |
129 | list_for_each_entry (dev, &bus->devices, bus_list) | 129 | list_for_each_entry (dev, &bus->devices, bus_list) |
130 | dbg("\t%s\n", pci_name(dev)); | 130 | dbg("\t%s\n", pci_name(dev)); |
131 | } | 131 | } |