diff options
| author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2006-01-26 10:03:40 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-23 14:35:12 -0800 |
| commit | 8abebe13f9df5b93be521eeefbf349236ddcd4eb (patch) | |
| tree | ebfef0af3f05f60525e49ae2d234087e47b35b1c /drivers/pci | |
| parent | 57c95c0d1c9ec83877dfea2f62bebf31059bc93c (diff) | |
[PATCH] shpchp - removed unncessary 'magic' member from slot
This patch removes unnecessary 'magic' member from struct slot of
SHPCHP driver.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/shpchp.h | 6 | ||||
| -rw-r--r-- | drivers/pci/hotplug/shpchp_core.c | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h index b1e2a770583..1e6d354fff3 100644 --- a/drivers/pci/hotplug/shpchp.h +++ b/drivers/pci/hotplug/shpchp.h @@ -53,9 +53,7 @@ extern int shpchp_debug; #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) -#define SLOT_MAGIC 0x67267321 struct slot { - u32 magic; u8 bus; u8 device; u16 status; @@ -287,10 +285,6 @@ static inline int slot_paranoia_check (struct slot *slot, const char *function) dbg("%s - slot == NULL", function); return -1; } - if (slot->magic != SLOT_MAGIC) { - dbg("%s - bad magic number for slot", function); - return -1; - } if (!slot->hotplug_slot) { dbg("%s - slot->hotplug_slot == NULL!", function); return -1; diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c index 08be8c1f5dc..4161da4bf4b 100644 --- a/drivers/pci/hotplug/shpchp_core.c +++ b/drivers/pci/hotplug/shpchp_core.c @@ -137,7 +137,6 @@ static int init_slots(struct controller *ctrl) hotplug_slot->name = name; slot->hp_slot = i; - slot->magic = SLOT_MAGIC; slot->ctrl = ctrl; slot->bus = ctrl->slot_bus; slot->device = ctrl->slot_device_offset + i; |