luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: pciehp: remove number field

Browse Source 
Since slot_cap field in struct controller contains physical slot
number informationq, we don't need number field in struct slot.

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>
This commit is contained in:
Kenji Kaneshige 2009-09-15 17:31:16 +09:00 committed by Jesse Barnes
parent 82a9e79ef1
commit 07a09694de
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/pci/hotplug/pciehp.h
View File

@ -73,7 +73,6 @@ do { \
#define SLOT_NAME_SIZE 10
struct slot {
u8 state;
u32 number;
struct controller *ctrl;
struct hotplug_slot *hotplug_slot;
struct delayed_work work; /* work for button event */

4
drivers/pci/hotplug/pciehp_core.c
View File

@ -121,11 +121,11 @@ static int init_slot(struct controller *ctrl)
hotplug->release = &release_slot;
hotplug->ops = &pciehp_hotplug_slot_ops;
slot->hotplug_slot = hotplug;
snprintf(name, SLOT_NAME_SIZE, "%u", slot->number);
snprintf(name, SLOT_NAME_SIZE, "%u", PSN(ctrl));
ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:00 sun=%x\n",
pci_domain_nr(ctrl->pcie->port->subordinate),
ctrl->pcie->port->subordinate->number, slot->number);
ctrl->pcie->port->subordinate->number, PSN(ctrl));
retval = pci_hp_register(hotplug,
ctrl->pcie->port->subordinate, 0, name);
if (retval) {

1
drivers/pci/hotplug/pciehp_hpc.c
View File

@ -901,7 +901,6 @@ static int pcie_init_slot(struct controller *ctrl)
return -ENOMEM;
slot->ctrl = ctrl;
slot->number = PSN(ctrl);
mutex_init(&slot->lock);
INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);
ctrl->slot = slot;