]> err.no Git - linux-2.6/commitdiff
shpchp: add message about shpchp_slot_with_bus option
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Tue, 27 May 2008 10:08:23 +0000 (19:08 +0900)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 27 May 2008 22:42:55 +0000 (15:42 -0700)
Some (broken?) platform assign the same slot name to multiple hotplug
slots. On such system, slot initialization would fail because of name
collision. The shpchp driver already have a "slot_with_bus" module
option which adds the bus number into the slot name. This patch adds
the message about this module option that will be displayed when slot
name collision is detected.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/pci/hotplug/shpchp_core.c

index 1648076600fc195a1c6a71a3f9ae444423400194..97848654652a1d2e03e6f648c268012f9b0711d9 100644 (file)
@@ -162,6 +162,10 @@ static int init_slots(struct controller *ctrl)
                retval = pci_hp_register(slot->hotplug_slot);
                if (retval) {
                        err("pci_hp_register failed with error %d\n", retval);
+                       if (retval == -EEXIST)
+                               err("Failed to register slot because of name "
+                                    "collision. Try \'shpchp_slot_with_bus\' "
+                                   "module option.\n");
                        goto error_info;
                }