[patch 035/104] PCI: cpqphp: stop managing hotplug_slot->name

From: Greg KH
Date: Wed Dec 03 2008 - 15:04:11 EST

Next message: Greg KH: "[patch 036/104] PCI: fakephp: remove name parameter"
Previous message: Greg KH: "[patch 034/104] PCI: cpci_hotplug: stop managing hotplug_slot->name"
In reply to: Scott Murray: "Re: [patch 034/104] PCI: cpci_hotplug: stop managinghotplug_slot->name"
Next in thread: Greg KH: "[patch 036/104] PCI: fakephp: remove name parameter"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

2.6.27-stable review patch. If anyone has any objections, please let us know.

------------------
From: Alex Chiang <achiang@xxxxxx>

commit 30ac7acd05d1449ac784de144c4b5237be25b0b4 upstream.

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.

Cc: jbarnes@xxxxxxxxxxxxxxxx
Cc: kristen.c.accardi@xxxxxxxxx
Acked-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
Signed-off-by: Alex Chiang <achiang@xxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

---
drivers/pci/hotplug/cpqphp.h | 13 ++++-------
drivers/pci/hotplug/cpqphp_core.c | 42 +++++++++++++++++---------------------
2 files changed, 24 insertions(+), 31 deletions(-)

--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -315,14 +315,15 @@ static void release_slot(struct hotplug_
{
struct slot *slot = hotplug_slot->private;

- dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __func__, slot_name(slot));

kfree(slot->hotplug_slot->info);
- kfree(slot->hotplug_slot->name);
kfree(slot->hotplug_slot);
kfree(slot);
}

+#define SLOT_NAME_SIZE 10
+
static int ctrl_slot_setup(struct controller *ctrl,
void __iomem *smbios_start,
void __iomem *smbios_table)
@@ -335,6 +336,7 @@ static int ctrl_slot_setup(struct contro
u8 slot_number;
u8 ctrl_slot;
u32 tempdword;
+ char name[SLOT_NAME_SIZE];
void __iomem *slot_entry= NULL;
int result = -ENOMEM;

@@ -363,16 +365,12 @@ static int ctrl_slot_setup(struct contro
if (!hotplug_slot->info)
goto error_hpslot;
hotplug_slot_info = hotplug_slot->info;
- hotplug_slot->name = kmalloc(SLOT_NAME_SIZE, GFP_KERNEL);
-
- if (!hotplug_slot->name)
- goto error_info;

slot->ctrl = ctrl;
slot->bus = ctrl->bus;
slot->device = slot_device;
slot->number = slot_number;
- dbg("slot->number = %d\n", slot->number);
+ dbg("slot->number = %u\n", slot->number);

slot_entry = get_SMBIOS_entry(smbios_start, smbios_table, 9,
slot_entry);
@@ -418,9 +416,9 @@ static int ctrl_slot_setup(struct contro
/* register this slot with the hotplug pci core */
hotplug_slot->release = &release_slot;
hotplug_slot->private = slot;
- make_slot_name(hotplug_slot->name, SLOT_NAME_SIZE, slot);
+ snprintf(name, SLOT_NAME_SIZE, "%u", slot->number);
hotplug_slot->ops = &cpqphp_hotplug_slot_ops;
-
+
hotplug_slot_info->power_status = get_slot_enabled(ctrl, slot);
hotplug_slot_info->attention_status =
cpq_get_attention_status(ctrl, slot);
@@ -437,10 +435,10 @@ static int ctrl_slot_setup(struct contro
result = pci_hp_register(hotplug_slot,
ctrl->pci_dev->bus,
slot->device,
- hotplug_slot->name);
+ name);
if (result) {
err("pci_hp_register failed with error %d\n", result);
- goto error_name;
+ goto error_info;
}

slot->next = ctrl->slot;
@@ -452,8 +450,6 @@ static int ctrl_slot_setup(struct contro
}

return 0;
-error_name:
- kfree(hotplug_slot->name);
error_info:
kfree(hotplug_slot_info);
error_hpslot:
@@ -639,7 +635,7 @@ static int set_attention_status (struct
u8 device;
u8 function;

- dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __func__, slot_name(slot));

if (cpqhp_get_bus_dev(ctrl, &bus, &devfn, slot->number) == -1)
return -ENODEV;
@@ -666,7 +662,7 @@ static int process_SI(struct hotplug_slo
u8 device;
u8 function;

- dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __func__, slot_name(slot));

if (cpqhp_get_bus_dev(ctrl, &bus, &devfn, slot->number) == -1)
return -ENODEV;
@@ -698,7 +694,7 @@ static int process_SS(struct hotplug_slo
u8 device;
u8 function;

- dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __func__, slot_name(slot));

if (cpqhp_get_bus_dev(ctrl, &bus, &devfn, slot->number) == -1)
return -ENODEV;
@@ -721,7 +717,7 @@ static int hardware_test(struct hotplug_
struct slot *slot = hotplug_slot->private;
struct controller *ctrl = slot->ctrl;

- dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __func__, slot_name(slot));

return cpqhp_hardware_test(ctrl, value);
}
@@ -732,7 +728,7 @@ static int get_power_status(struct hotpl
struct slot *slot = hotplug_slot->private;
struct controller *ctrl = slot->ctrl;

- dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __func__, slot_name(slot));

*value = get_slot_enabled(ctrl, slot);
return 0;
@@ -743,7 +739,7 @@ static int get_attention_status(struct h
struct slot *slot = hotplug_slot->private;
struct controller *ctrl = slot->ctrl;

- dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __func__, slot_name(slot));

*value = cpq_get_attention_status(ctrl, slot);
return 0;
@@ -754,7 +750,7 @@ static int get_latch_status(struct hotpl
struct slot *slot = hotplug_slot->private;
struct controller *ctrl = slot->ctrl;

- dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __func__, slot_name(slot));

*value = cpq_get_latch_status(ctrl, slot);

@@ -766,7 +762,7 @@ static int get_adapter_status(struct hot
struct slot *slot = hotplug_slot->private;
struct controller *ctrl = slot->ctrl;

- dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __func__, slot_name(slot));

*value = get_presence_status(ctrl, slot);

@@ -778,7 +774,7 @@ static int get_max_bus_speed (struct hot
struct slot *slot = hotplug_slot->private;
struct controller *ctrl = slot->ctrl;

- dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __func__, slot_name(slot));

*value = ctrl->speed_capability;

@@ -790,7 +786,7 @@ static int get_cur_bus_speed (struct hot
struct slot *slot = hotplug_slot->private;
struct controller *ctrl = slot->ctrl;

- dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __func__, slot_name(slot));

*value = ctrl->speed;

--- a/drivers/pci/hotplug/cpqphp.h
+++ b/drivers/pci/hotplug/cpqphp.h
@@ -449,6 +449,11 @@ extern u8 cpqhp_disk_irq;

/* inline functions */

+static inline char *slot_name(struct slot *slot)
+{
+ return hotplug_slot_name(slot->hotplug_slot);
+}
+
/*
* return_resource
*
@@ -696,14 +701,6 @@ static inline int get_presence_status(st
return presence_save;
}

-#define SLOT_NAME_SIZE 10
-
-static inline void make_slot_name(char *buffer, int buffer_size, struct slot *slot)
-{
- snprintf(buffer, buffer_size, "%d", slot->number);
-}
-
-
static inline int wait_for_ctrl_irq(struct controller *ctrl)
{
DECLARE_WAITQUEUE(wait, current);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Greg KH: "[patch 036/104] PCI: fakephp: remove name parameter"
Previous message: Greg KH: "[patch 034/104] PCI: cpci_hotplug: stop managing hotplug_slot->name"
In reply to: Scott Murray: "Re: [patch 034/104] PCI: cpci_hotplug: stop managinghotplug_slot->name"
Next in thread: Greg KH: "[patch 036/104] PCI: fakephp: remove name parameter"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]