|
@@ -60,12 +60,6 @@ int __ref shpchp_configure_device(struct slot *p_slot)
|
|
dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, fn));
|
|
dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, fn));
|
|
if (!dev)
|
|
if (!dev)
|
|
continue;
|
|
continue;
|
|
- if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
|
|
|
|
- ctrl_err(ctrl, "Cannot hot-add display device %s\n",
|
|
|
|
- pci_name(dev));
|
|
|
|
- pci_dev_put(dev);
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
|
|
if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
|
|
(dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) {
|
|
(dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) {
|
|
/* Find an unused bus number for the new bridge */
|
|
/* Find an unused bus number for the new bridge */
|
|
@@ -114,17 +108,11 @@ int shpchp_unconfigure_device(struct slot *p_slot)
|
|
ctrl_dbg(ctrl, "%s: domain:bus:dev = %04x:%02x:%02x\n",
|
|
ctrl_dbg(ctrl, "%s: domain:bus:dev = %04x:%02x:%02x\n",
|
|
__func__, pci_domain_nr(parent), p_slot->bus, p_slot->device);
|
|
__func__, pci_domain_nr(parent), p_slot->bus, p_slot->device);
|
|
|
|
|
|
- for (j=0; j<8 ; j++) {
|
|
|
|
- struct pci_dev* temp = pci_get_slot(parent,
|
|
|
|
|
|
+ for (j = 0; j < 8 ; j++) {
|
|
|
|
+ struct pci_dev *temp = pci_get_slot(parent,
|
|
(p_slot->device << 3) | j);
|
|
(p_slot->device << 3) | j);
|
|
if (!temp)
|
|
if (!temp)
|
|
continue;
|
|
continue;
|
|
- if ((temp->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
|
|
|
|
- ctrl_err(ctrl, "Cannot remove display device %s\n",
|
|
|
|
- pci_name(temp));
|
|
|
|
- pci_dev_put(temp);
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
if (temp->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
|
|
if (temp->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
|
|
pci_read_config_byte(temp, PCI_BRIDGE_CONTROL, &bctl);
|
|
pci_read_config_byte(temp, PCI_BRIDGE_CONTROL, &bctl);
|
|
if (bctl & PCI_BRIDGE_CTL_VGA) {
|
|
if (bctl & PCI_BRIDGE_CTL_VGA) {
|
|
@@ -132,7 +120,8 @@ int shpchp_unconfigure_device(struct slot *p_slot)
|
|
"Cannot remove display device %s\n",
|
|
"Cannot remove display device %s\n",
|
|
pci_name(temp));
|
|
pci_name(temp));
|
|
pci_dev_put(temp);
|
|
pci_dev_put(temp);
|
|
- continue;
|
|
|
|
|
|
+ rc = -EINVAL;
|
|
|
|
+ break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
pci_remove_bus_device(temp);
|
|
pci_remove_bus_device(temp);
|