[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>

diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index b1e2a7705835891b9d5f19842441c1b4a82c925c..1e6d354fff38b15f4b70fff81e2429e01d1ce7d2 100644 (file)
--- 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 08be8c1f5dcc5c7d4f2441be4155d396fc5ed721..4161da4bf4ba681980e46c7fc6c6980df963ad1a 100644 (file)
--- 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;