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

Commit f45651f9 authored by Samuel Iglesias Gonsálvez's avatar Samuel Iglesias Gonsálvez Committed by Greg Kroah-Hartman
Browse files

Staging: ipack/bridges/tpci200: remove linked list of registered devices 



The linked list of registered devices is not needed as the struct
tpci200_board is saved in private data field of the pci device.

Signed-off-by: default avatarJens Taprogge <jens.taprogge@taprogge.org>
Signed-off-by: default avatarSamuel Iglesias Gonsálvez <siglesias@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e58d05a

drivers/staging/ipack/bridges/tpci200.c

+6 −28
Original line number Diff line number Diff line
@@ -24,28 +24,20 @@ static int control_reg[] = { 
	TPCI200_CONTROL_D_REG

};



/* Linked list to save the registered devices */

static LIST_HEAD(tpci200_list);



static int tpci200_slot_unregister(struct ipack_device *dev);



static struct tpci200_board *check_slot(struct ipack_device *dev)

{

	struct tpci200_board *tpci200;

	int found = 0;



	if (dev == NULL)

		return NULL;



	list_for_each_entry(tpci200, &tpci200_list, list) {

		if (tpci200->number == dev->bus_nr) {

			found = 1;

			break;

		}

	}



	if (!found) {

		dev_err(&dev->dev, "Carrier not found\n");

	tpci200 = dev_get_drvdata(dev->bus->parent);



	if (tpci200 == NULL) {

		dev_info(&dev->dev, "carrier board not found\n");

		return NULL;

	}
@@ -831,8 +823,6 @@ static int tpci200_pciprobe(struct pci_dev *pdev, 
	/* save the bus number given by ipack to logging purpose */

	tpci200->number = tpci200->info->ipack_bus->bus_nr;

	dev_set_drvdata(&pdev->dev, tpci200);

	/* add the registered device in an internal linked list */

	list_add_tail(&tpci200->list, &tpci200_list);



	/*

	 * Give the same IRQ number as the slot number.
@@ -847,7 +837,6 @@ static int tpci200_pciprobe(struct pci_dev *pdev, 
static void __tpci200_pci_remove(struct tpci200_board *tpci200)

{

	tpci200_uninstall(tpci200);

	list_del(&tpci200->list);

	ipack_bus_unregister(tpci200->info->ipack_bus);

	kfree(tpci200->info);

	kfree(tpci200);
@@ -855,15 +844,9 @@ static void __tpci200_pci_remove(struct tpci200_board *tpci200) 


static void __devexit tpci200_pci_remove(struct pci_dev *dev)

{

	struct tpci200_board *tpci200, *next;

	struct tpci200_board *tpci200 = pci_get_drvdata(dev);



	/* Search the registered device to uninstall it */

	list_for_each_entry_safe(tpci200, next, &tpci200_list, list) {

		if (tpci200->info->pdev == dev) {

	__tpci200_pci_remove(tpci200);

			break;

		}

	}

}



static DEFINE_PCI_DEVICE_TABLE(tpci200_idtable) = {
@@ -888,11 +871,6 @@ static int __init tpci200_drvr_init_module(void) 


static void __exit tpci200_drvr_exit_module(void)

{

	struct tpci200_board *tpci200, *next;



	list_for_each_entry_safe(tpci200, next, &tpci200_list, list)

		__tpci200_pci_remove(tpci200);



	pci_unregister_driver(&tpci200_pci_drv);

}