ChangeSet 1.1587.12.41, 2004/04/30 14:15:38-07:00, eike-hotplug@sf-tec.de [PATCH] Compaq PCI Hotplug: some final fixes for cpqphp_core.c Final small fixes for cpqphp_core.c: -use better error handling in one_time_init -small coding style fixes -the name of the driver is not "pci_hotplug" -add an __exit for unload_cpqphp -changes enough to increment version, isn't it? drivers/pci/hotplug/cpqphp_core.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff -Nru a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c --- a/drivers/pci/hotplug/cpqphp_core.c Mon May 17 17:01:42 2004 +++ b/drivers/pci/hotplug/cpqphp_core.c Mon May 17 17:01:42 2004 @@ -61,7 +61,7 @@ static int power_mode; static int debug; -#define DRIVER_VERSION "0.9.7" +#define DRIVER_VERSION "0.9.8" #define DRIVER_AUTHOR "Dan Zink , Greg Kroah-Hartman " #define DRIVER_DESC "Compaq Hot Plug PCI Controller Driver" @@ -627,9 +627,8 @@ dbg("bus, dev, fn = %d, %d, %d\n", bus, device, function); slot_func = cpqhp_slot_find(bus, device, function); - if (!slot_func) { + if (!slot_func) return -ENODEV; - } return cpqhp_set_attention_status(ctrl, slot_func, status); } @@ -702,7 +701,7 @@ dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name); - return cpqhp_hardware_test (ctrl, value); + return cpqhp_hardware_test(ctrl, value); } @@ -1311,7 +1310,7 @@ if (!smbios_table) { err ("Could not find the SMBIOS pointer in memory\n"); retval = -EIO; - goto error; + goto error_rom_start; } smbios_start = ioremap(readl(smbios_table + ST_ADDRESS), @@ -1319,24 +1318,23 @@ if (!smbios_start) { err ("Could not ioremap memory region taken from SMBIOS values\n"); retval = -EIO; - goto error; + goto error_smbios_start; } initialized = 1; return retval; +error_smbios_start: + iounmap(smbios_start); +error_rom_start: + iounmap(cpqhp_rom_start); error: - if (cpqhp_rom_start) - iounmap(cpqhp_rom_start); - if (smbios_start) - iounmap(smbios_start); - return retval; } -static void unload_cpqphpd(void) +static void __exit unload_cpqphpd(void) { struct pci_func *next; struct pci_func *TempSlot; @@ -1470,7 +1468,7 @@ static struct pci_driver cpqhpc_driver = { - .name = "pci_hotplug", + .name = "compaq_pci_hotplug", .id_table = hpcd_pci_tbl, .probe = cpqhpc_probe, /* remove: cpqhpc_remove_one, */