Commit e1a6333e authored by Vihas Mak's avatar Vihas Mak Committed by Bjorn Helgaas
Browse files

PCI: ibmphp: Remove commented-out functions 

The functions get_max_adapter_speed() and get_bus_name() in ibmphp_core.c
are commented-out and the fields .get_max_adapter_speed and
.get_bus_name_status are removed from struct hotplug_slot_ops in
pci_hotplug.h. Remove the commented-out functions.

Link: https://lore.kernel.org/r/20211209213618.20522-1-makvihas@gmail.com


Signed-off-by: default avatarVihas Mak <makvihas@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 23584c1e

drivers/pci/hotplug/TODO

+0 −5
Original line number Diff line number Diff line
@@ -30,11 +30,6 @@ ibmphp: 
  or ibmphp should store a pointer to its bus in struct slot.  Probably the

  former.



* The functions get_max_adapter_speed() and get_bus_name() are commented out.

  Can they be deleted?  There are also forward declarations at the top of

  ibmphp_core.c as well as pointers in ibmphp_hotplug_slot_ops, likewise

  commented out.



* ibmphp_init_devno() takes a struct slot **, it could instead take a

  struct slot *.

drivers/pci/hotplug/ibmphp_core.c

+0 −74
Original line number Diff line number Diff line
@@ -50,14 +50,6 @@ static int irqs[16]; /* PIC mode IRQs we're using so far (in case MPS 


static int init_flag;



/*

static int get_max_adapter_speed_1 (struct hotplug_slot *, u8 *, u8);



static inline int get_max_adapter_speed (struct hotplug_slot *hs, u8 *value)

{

	return get_max_adapter_speed_1 (hs, value, 1);

}

*/

static inline int get_cur_bus_info(struct slot **sl)

{

	int rc = 1;
@@ -401,69 +393,6 @@ static int get_max_bus_speed(struct slot *slot) 
	return rc;

}



/*

static int get_max_adapter_speed_1(struct hotplug_slot *hotplug_slot, u8 *value, u8 flag)

{

	int rc = -ENODEV;

	struct slot *pslot;

	struct slot myslot;



	debug("get_max_adapter_speed_1 - Entry hotplug_slot[%lx] pvalue[%lx]\n",

						(ulong)hotplug_slot, (ulong) value);



	if (flag)

		ibmphp_lock_operations();



	if (hotplug_slot && value) {

		pslot = hotplug_slot->private;

		if (pslot) {

			memcpy(&myslot, pslot, sizeof(struct slot));

			rc = ibmphp_hpc_readslot(pslot, READ_SLOTSTATUS,

						&(myslot.status));



			if (!(SLOT_LATCH (myslot.status)) &&

					(SLOT_PRESENT (myslot.status))) {

				rc = ibmphp_hpc_readslot(pslot,

						READ_EXTSLOTSTATUS,

						&(myslot.ext_status));

				if (!rc)

					*value = SLOT_SPEED(myslot.ext_status);

			} else

				*value = MAX_ADAPTER_NONE;

		}

	}



	if (flag)

		ibmphp_unlock_operations();



	debug("get_max_adapter_speed_1 - Exit rc[%d] value[%x]\n", rc, *value);

	return rc;

}



static int get_bus_name(struct hotplug_slot *hotplug_slot, char *value)

{

	int rc = -ENODEV;

	struct slot *pslot = NULL;



	debug("get_bus_name - Entry hotplug_slot[%lx]\n", (ulong)hotplug_slot);



	ibmphp_lock_operations();



	if (hotplug_slot) {

		pslot = hotplug_slot->private;

		if (pslot) {

			rc = 0;

			snprintf(value, 100, "Bus %x", pslot->bus);

		}

	} else

		rc = -ENODEV;



	ibmphp_unlock_operations();

	debug("get_bus_name - Exit rc[%d] value[%x]\n", rc, *value);

	return rc;

}

*/



/****************************************************************************

 * This routine will initialize the ops data structure used in the validate

 * function. It will also power off empty slots that are powered on since BIOS
@@ -1231,9 +1160,6 @@ const struct hotplug_slot_ops ibmphp_hotplug_slot_ops = { 
	.get_attention_status =		get_attention_status,

	.get_latch_status =		get_latch_status,

	.get_adapter_status =		get_adapter_present,

/*	.get_max_adapter_speed =	get_max_adapter_speed,

	.get_bus_name_status =		get_bus_name,

*/

};



static void ibmphp_unload(void)