diff options
author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2006-01-25 20:03:40 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-23 17:35:12 -0500 |
commit | 8abebe13f9df5b93be521eeefbf349236ddcd4eb (patch) | |
tree | ebfef0af3f05f60525e49ae2d234087e47b35b1c /drivers/pci/hotplug/shpchp.h | |
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/hotplug/shpchp.h')
-rw-r--r-- | drivers/pci/hotplug/shpchp.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h index b1e2a7705835..1e6d354fff38 100644 --- a/drivers/pci/hotplug/shpchp.h +++ b/drivers/pci/hotplug/shpchp.h | |||
@@ -53,9 +53,7 @@ extern int shpchp_debug; | |||
53 | #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) | 53 | #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) |
54 | #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) | 54 | #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) |
55 | 55 | ||
56 | #define SLOT_MAGIC 0x67267321 | ||
57 | struct slot { | 56 | struct slot { |
58 | u32 magic; | ||
59 | u8 bus; | 57 | u8 bus; |
60 | u8 device; | 58 | u8 device; |
61 | u16 status; | 59 | u16 status; |
@@ -287,10 +285,6 @@ static inline int slot_paranoia_check (struct slot *slot, const char *function) | |||
287 | dbg("%s - slot == NULL", function); | 285 | dbg("%s - slot == NULL", function); |
288 | return -1; | 286 | return -1; |
289 | } | 287 | } |
290 | if (slot->magic != SLOT_MAGIC) { | ||
291 | dbg("%s - bad magic number for slot", function); | ||
292 | return -1; | ||
293 | } | ||
294 | if (!slot->hotplug_slot) { | 288 | if (!slot->hotplug_slot) { |
295 | dbg("%s - slot->hotplug_slot == NULL!", function); | 289 | dbg("%s - slot->hotplug_slot == NULL!", function); |
296 | return -1; | 290 | return -1; |