projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
[cascardo/linux.git]
/
drivers
/
pci
/
hotplug
/
rpaphp_pci.c
diff --git
a/drivers/pci/hotplug/rpaphp_pci.c
b/drivers/pci/hotplug/rpaphp_pci.c
index
6571e9b
..
513e1e2
100644
(file)
--- 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)
if (rc < 0) {
if (rc == -EFAULT || rc == -EEXIST) {
dbg("%s: slot must be power up to get sensor-state\n",
if (rc < 0) {
if (rc == -EFAULT || rc == -EEXIST) {
dbg("%s: slot must be power up to get sensor-state\n",
- __
FUNCTION
__);
+ __
func
__);
/* some slots have to be powered up
* before get-sensor will succeed.
/* some slots have to be powered up
* before get-sensor will succeed.
@@
-51,15
+51,15
@@
int rpaphp_get_sensor_state(struct slot *slot, int *state)
&setlevel);
if (rc < 0) {
dbg("%s: power on slot[%s] failed rc=%d.\n",
&setlevel);
if (rc < 0) {
dbg("%s: power on slot[%s] failed rc=%d.\n",
- __
FUNCTION
__, slot->name, rc);
+ __
func
__, slot->name, rc);
} else {
rc = rtas_get_sensor(DR_ENTITY_SENSE,
slot->index, state);
}
} else if (rc == -ENODEV)
} else {
rc = rtas_get_sensor(DR_ENTITY_SENSE,
slot->index, state);
}
} else if (rc == -ENODEV)
- info("%s: slot is unusable\n", __
FUNCTION
__);
+ info("%s: slot is unusable\n", __
func
__);
else
else
- err("%s failed to get sensor state\n", __
FUNCTION
__);
+ err("%s failed to get sensor state\n", __
func
__);
}
return rc;
}
}
return rc;
}
@@
-95,7
+95,7
@@
int rpaphp_enable_slot(struct slot *slot)
bus = pcibios_find_pci_bus(slot->dn);
if (!bus) {
bus = pcibios_find_pci_bus(slot->dn);
if (!bus) {
- err("%s: no pci_bus for dn %s\n", __
FUNCTION
__, slot->dn->full_name);
+ err("%s: no pci_bus for dn %s\n", __
func
__, slot->dn->full_name);
return -EINVAL;
}
return -EINVAL;
}
@@
-111,7
+111,7
@@
int rpaphp_enable_slot(struct slot *slot)
/* non-empty slot has to have child */
if (!slot->dn->child) {
err("%s: slot[%s]'s device_node doesn't have child for adapter\n",
/* non-empty slot has to have child */
if (!slot->dn->child) {
err("%s: slot[%s]'s device_node doesn't have child for adapter\n",
- __
FUNCTION
__, slot->name);
+ __
func
__, slot->name);
return -EINVAL;
}
return -EINVAL;
}
@@
-123,9
+123,9
@@
int rpaphp_enable_slot(struct slot *slot)
slot->state = CONFIGURED;
}
slot->state = CONFIGURED;
}
- if (debug) {
+ if (
rpaphp_
debug) {
struct pci_dev *dev;
struct pci_dev *dev;
- dbg("%s: pci_devs of slot[%s]\n", __
FUNCTION
__, slot->dn->full_name);
+ dbg("%s: pci_devs of slot[%s]\n", __
func
__, slot->dn->full_name);
list_for_each_entry (dev, &bus->devices, bus_list)
dbg("\t%s\n", pci_name(dev));
}
list_for_each_entry (dev, &bus->devices, bus_list)
dbg("\t%s\n", pci_name(dev));
}