Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PCI: ibmphp: stop managing hotplug_slot->name

Browse source 
We no longer need to manage our version of hotplug_slot->name
since the PCI and hotplug core manage it on our behalf.

Now, we simply advise the PCI core of the name that we would
like, and let the core take care of the rest.

Additionally, slightly rearrange the members of struct slot
so they are naturally aligned to eliminate holes.

Cc: jbarnes@virtuousgeek.org
Cc: kristen.c.accardi@intel.com
Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Alex Chiang 2008-10-20 17:41:33 -06:00 committed by Jesse Barnes
parent 43caae884b
commit a32615a1a6
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/pci/hotplug/ibmphp.h
View file

@ -707,17 +707,16 @@ struct slot {
u8 device; u8 device;
u8 number; u8 number;
u8 real_physical_slot_num; u8 real_physical_slot_num;
char name[100];
u32 capabilities; u32 capabilities;
u8 supported_speed; u8 supported_speed;
u8 supported_bus_mode; u8 supported_bus_mode;
u8 flag; /* this is for disable slot and polling */
u8 ctlr_index;
struct hotplug_slot *hotplug_slot; struct hotplug_slot *hotplug_slot;
struct controller *ctrl; struct controller *ctrl;
struct pci_func *func; struct pci_func *func;
u8 irq[4]; u8 irq[4];
u8 flag; /* this is for disable slot and polling */
int bit_mode; /* 0 = 32, 1 = 64 */ int bit_mode; /* 0 = 32, 1 = 64 */
u8 ctlr_index;
struct bus_info *bus_on; struct bus_info *bus_on;
struct list_head ibm_slot_list; struct list_head ibm_slot_list;
u8 status; u8 status;

20
drivers/pci/hotplug/ibmphp_ebda.c
View file

@ -587,11 +587,14 @@ static u8 calculate_first_slot (u8 slot_num)
return first_slot + 1; return first_slot + 1;
} }
#define SLOT_NAME_SIZE 30
static char *create_file_name (struct slot * slot_cur) static char *create_file_name (struct slot * slot_cur)
{ {
struct opt_rio *opt_vg_ptr = NULL; struct opt_rio *opt_vg_ptr = NULL;
struct opt_rio_lo *opt_lo_ptr = NULL; struct opt_rio_lo *opt_lo_ptr = NULL;
static char str[30]; static char str[SLOT_NAME_SIZE];
int which = 0; /* rxe = 1, chassis = 0 */ int which = 0; /* rxe = 1, chassis = 0 */
u8 number = 1; /* either chassis or rxe # */ u8 number = 1; /* either chassis or rxe # */
u8 first_slot = 1; u8 first_slot = 1;
@ -703,7 +706,6 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
slot = hotplug_slot->private; slot = hotplug_slot->private;
kfree(slot->hotplug_slot->info); kfree(slot->hotplug_slot->info);
kfree(slot->hotplug_slot->name);
kfree(slot->hotplug_slot); kfree(slot->hotplug_slot);
slot->ctrl = NULL; slot->ctrl = NULL;
slot->bus_on = NULL; slot->bus_on = NULL;
@ -734,6 +736,7 @@ static int __init ebda_rsrc_controller (void)
struct bus_info *bus_info_ptr1, *bus_info_ptr2; struct bus_info *bus_info_ptr1, *bus_info_ptr2;
int rc; int rc;
struct slot *tmp_slot; struct slot *tmp_slot;
char name[SLOT_NAME_SIZE];
addr = hpc_list_ptr->phys_addr; addr = hpc_list_ptr->phys_addr;
for (ctlr = 0; ctlr < hpc_list_ptr->num_ctlrs; ctlr++) { for (ctlr = 0; ctlr < hpc_list_ptr->num_ctlrs; ctlr++) {
@ -897,12 +900,6 @@ static int __init ebda_rsrc_controller (void)
goto error_no_hp_info; goto error_no_hp_info;
} }
hp_slot_ptr->name = kmalloc(30, GFP_KERNEL);
if (!hp_slot_ptr->name) {
rc = -ENOMEM;
goto error_no_hp_name;
}
tmp_slot = kzalloc(sizeof(*tmp_slot), GFP_KERNEL); tmp_slot = kzalloc(sizeof(*tmp_slot), GFP_KERNEL);
if (!tmp_slot) { if (!tmp_slot) {
rc = -ENOMEM; rc = -ENOMEM;
@ -964,10 +961,9 @@ static int __init ebda_rsrc_controller (void)
} /* each hpc */ } /* each hpc */
list_for_each_entry(tmp_slot, &ibmphp_slot_head, ibm_slot_list) { list_for_each_entry(tmp_slot, &ibmphp_slot_head, ibm_slot_list) {
snprintf (tmp_slot->hotplug_slot->name, 30, "%s", create_file_name (tmp_slot)); snprintf(name, SLOT_NAME_SIZE, "%s", create_file_name(tmp_slot));
pci_hp_register(tmp_slot->hotplug_slot, pci_hp_register(tmp_slot->hotplug_slot,
pci_find_bus(0, tmp_slot->bus), tmp_slot->device, pci_find_bus(0, tmp_slot->bus), tmp_slot->device, name);
tmp_slot->hotplug_slot->name);
} }
print_ebda_hpc (); print_ebda_hpc ();
@ -977,8 +973,6 @@ static int __init ebda_rsrc_controller (void)
error: error:
kfree (hp_slot_ptr->private); kfree (hp_slot_ptr->private);
error_no_slot: error_no_slot:
kfree (hp_slot_ptr->name);
error_no_hp_name:
kfree (hp_slot_ptr->info); kfree (hp_slot_ptr->info);
error_no_hp_info: error_no_hp_info:
kfree (hp_slot_ptr); kfree (hp_slot_ptr);