diff options
author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2009-09-15 04:33:30 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-17 13:06:41 -0400 |
commit | d9fb42a845f8e56d91017462650ba41e854f5552 (patch) | |
tree | 30600b2e6d3cb3319d46e234f83779745d738818 | |
parent | 07a09694de556f307b1c5035cdf0f17c6243d1cd (diff) |
PCI: pciehp: remove error message definitions
Remove (almost) unused error message definitions.
Acked-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r-- | drivers/pci/hotplug/pciehp.h | 11 | ||||
-rw-r--r-- | drivers/pci/hotplug/pciehp_ctrl.c | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index b20a38da7a80..13be51dd401e 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h | |||
@@ -117,17 +117,6 @@ struct controller { | |||
117 | #define POWERON_STATE 3 | 117 | #define POWERON_STATE 3 |
118 | #define POWEROFF_STATE 4 | 118 | #define POWEROFF_STATE 4 |
119 | 119 | ||
120 | /* Error messages */ | ||
121 | #define INTERLOCK_OPEN 0x00000002 | ||
122 | #define ADD_NOT_SUPPORTED 0x00000003 | ||
123 | #define CARD_FUNCTIONING 0x00000005 | ||
124 | #define ADAPTER_NOT_SAME 0x00000006 | ||
125 | #define NO_ADAPTER_PRESENT 0x00000009 | ||
126 | #define NOT_ENOUGH_RESOURCES 0x0000000B | ||
127 | #define DEVICE_TYPE_NOT_SUPPORTED 0x0000000C | ||
128 | #define WRONG_BUS_FREQUENCY 0x0000000D | ||
129 | #define POWER_FAILURE 0x0000000E | ||
130 | |||
131 | /* Field definitions in Slot Capabilities Register */ | 120 | /* Field definitions in Slot Capabilities Register */ |
132 | #define ATTN_BUTTN_PRSN 0x00000001 | 121 | #define ATTN_BUTTN_PRSN 0x00000001 |
133 | #define PWR_CTRL_PRSN 0x00000002 | 122 | #define PWR_CTRL_PRSN 0x00000002 |
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index 81c322de137d..84487d126e4d 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c | |||
@@ -231,7 +231,7 @@ static int board_added(struct slot *p_slot) | |||
231 | /* Check for a power fault */ | 231 | /* Check for a power fault */ |
232 | if (pciehp_query_power_fault(p_slot)) { | 232 | if (pciehp_query_power_fault(p_slot)) { |
233 | ctrl_dbg(ctrl, "Power fault detected\n"); | 233 | ctrl_dbg(ctrl, "Power fault detected\n"); |
234 | retval = POWER_FAILURE; | 234 | retval = -EIO; |
235 | goto err_exit; | 235 | goto err_exit; |
236 | } | 236 | } |
237 | 237 | ||