From 302b2dd92e1ed283c93e36fb694d0a3470cd7537 Mon Sep 17 00:00:00 2001 From: Kenji Kaneshige Date: Tue, 15 Sep 2009 17:33:30 +0900 Subject: [PATCH] --- yaml --- r: 165975 b: refs/heads/master c: d9fb42a845f8e56d91017462650ba41e854f5552 h: refs/heads/master i: 165973: de4cff6ccddd25214c8ebc39bb00daeb3b90cdb5 165971: 1e1ac992988c9c0f7417af5474be26791deb4826 165967: 3ccbaed06110cdb8c178ec04cbfa9f6dd9fbd364 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/pciehp.h | 11 ----------- trunk/drivers/pci/hotplug/pciehp_ctrl.c | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 15d7b08620ee..990c18721525 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07a09694de556f307b1c5035cdf0f17c6243d1cd +refs/heads/master: d9fb42a845f8e56d91017462650ba41e854f5552 diff --git a/trunk/drivers/pci/hotplug/pciehp.h b/trunk/drivers/pci/hotplug/pciehp.h index b20a38da7a80..13be51dd401e 100644 --- a/trunk/drivers/pci/hotplug/pciehp.h +++ b/trunk/drivers/pci/hotplug/pciehp.h @@ -117,17 +117,6 @@ struct controller { #define POWERON_STATE 3 #define POWEROFF_STATE 4 -/* Error messages */ -#define INTERLOCK_OPEN 0x00000002 -#define ADD_NOT_SUPPORTED 0x00000003 -#define CARD_FUNCTIONING 0x00000005 -#define ADAPTER_NOT_SAME 0x00000006 -#define NO_ADAPTER_PRESENT 0x00000009 -#define NOT_ENOUGH_RESOURCES 0x0000000B -#define DEVICE_TYPE_NOT_SUPPORTED 0x0000000C -#define WRONG_BUS_FREQUENCY 0x0000000D -#define POWER_FAILURE 0x0000000E - /* Field definitions in Slot Capabilities Register */ #define ATTN_BUTTN_PRSN 0x00000001 #define PWR_CTRL_PRSN 0x00000002 diff --git a/trunk/drivers/pci/hotplug/pciehp_ctrl.c b/trunk/drivers/pci/hotplug/pciehp_ctrl.c index 81c322de137d..84487d126e4d 100644 --- a/trunk/drivers/pci/hotplug/pciehp_ctrl.c +++ b/trunk/drivers/pci/hotplug/pciehp_ctrl.c @@ -231,7 +231,7 @@ static int board_added(struct slot *p_slot) /* Check for a power fault */ if (pciehp_query_power_fault(p_slot)) { ctrl_dbg(ctrl, "Power fault detected\n"); - retval = POWER_FAILURE; + retval = -EIO; goto err_exit; }