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

Commit fa189159 authored by Linas Vepstas's avatar Linas Vepstas Committed by Greg Kroah-Hartman
Browse files

PCI: rpaphp: Remove global num_slots variable 



Cleanup cruft: remove the global "num_slots" variable; 
although scattered across multiple files, it is used only 
once, in a debug statement.

Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@austin.ibm.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bf8cbae4

drivers/pci/hotplug/rpaphp.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ struct slot { 


extern struct hotplug_slot_ops rpaphp_hotplug_slot_ops;

extern struct list_head rpaphp_slot_head;

extern int num_slots;



/* function prototypes */

drivers/pci/hotplug/rpaphp_core.c

+1 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
int debug;

static struct semaphore rpaphp_sem;

LIST_HEAD(rpaphp_slot_head);

int num_slots;



#define DRIVER_VERSION	"0.1"

#define DRIVER_AUTHOR	"Linda Xie <lxie@us.ibm.com>"
@@ -325,8 +324,7 @@ int rpaphp_add_slot(struct device_node *dn) 
		name += strlen(name) + 1;

		type += strlen(type) + 1;

	}

	dbg("%s - Exit: num_slots=%d rc[%d]\n",

	    __FUNCTION__, num_slots, retval);

	dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);

	return retval;

}

drivers/pci/hotplug/rpaphp_slot.c

+0 −3
Original line number Diff line number Diff line
@@ -140,8 +140,6 @@ int rpaphp_deregister_slot(struct slot *slot) 
	retval = pci_hp_deregister(php_slot);

	if (retval)

		err("Problem unregistering a slot %s\n", slot->name);

	else

		num_slots--;



	dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);

	return retval;
@@ -181,7 +179,6 @@ int rpaphp_register_slot(struct slot *slot) 
	list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head);

	info("Slot [%s](PCI location=%s) registered\n", slot->name,

			slot->location);

	num_slots++;

	return 0;



sysfs_fail: