Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8abebe13 authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Greg Kroah-Hartman
Browse files

[PATCH] shpchp - removed unncessary 'magic' member from slot 



This patch removes unnecessary 'magic' member from struct slot of
SHPCHP driver.

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 57c95c0d

drivers/pci/hotplug/shpchp.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -53,9 +53,7 @@ extern int shpchp_debug; 
#define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg)

#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 warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)





#define SLOT_MAGIC	0x67267321

struct slot {

struct slot {

	u32 magic;

	u8 bus;

	u8 bus;

	u8 device;

	u8 device;

	u16 status;

	u16 status;
@@ -287,10 +285,6 @@ static inline int slot_paranoia_check (struct slot *slot, const char *function) 
		dbg("%s - slot == NULL", function);

		dbg("%s - slot == NULL", function);

		return -1;

		return -1;

	}

	}

	if (slot->magic != SLOT_MAGIC) {

		dbg("%s - bad magic number for slot", function);

		return -1;

	}

	if (!slot->hotplug_slot) {

	if (!slot->hotplug_slot) {

		dbg("%s - slot->hotplug_slot == NULL!", function);

		dbg("%s - slot->hotplug_slot == NULL!", function);

		return -1;

		return -1;

drivers/pci/hotplug/shpchp_core.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -137,7 +137,6 @@ static int init_slots(struct controller *ctrl) 
		hotplug_slot->name = name;

		hotplug_slot->name = name;





		slot->hp_slot = i;

		slot->hp_slot = i;

		slot->magic = SLOT_MAGIC;

		slot->ctrl = ctrl;

		slot->ctrl = ctrl;

		slot->bus = ctrl->slot_bus;

		slot->bus = ctrl->slot_bus;

		slot->device = ctrl->slot_device_offset + i;

		slot->device = ctrl->slot_device_offset + i;