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

Commit 9901a4d7 authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman
Browse files

staging/comedi: Use comedi_pci_auto_unconfig directly for pci_driver.remove 



(Almost) all comedi pci drivers have some wrapper for their
pci_driver.remove function which simply calls comedi_pci_auto_unconfig
which has the same function prototype as the wrapper.

-> we can remove these wrappers and call comedi_pci_auto_unconfig
directly. This removes a lot some boilerplate code and saves some bytes.

Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c2f90a20

drivers/staging/comedi/drivers/8255_pci.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -314,11 +314,6 @@ static int pci_8255_pci_probe(struct pci_dev *dev, 
	return comedi_pci_auto_config(dev, &pci_8255_driver);

	return comedi_pci_auto_config(dev, &pci_8255_driver);

}

}





static void pci_8255_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static DEFINE_PCI_DEVICE_TABLE(pci_8255_pci_table) = {

static DEFINE_PCI_DEVICE_TABLE(pci_8255_pci_table) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_ADLINK_PCI7224) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_ADLINK_PCI7224) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_ADLINK_PCI7248) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_ADLINK_PCI7248) },
@@ -342,7 +337,7 @@ static struct pci_driver pci_8255_pci_driver = { 
	.name		= "8255_pci",

	.name		= "8255_pci",

	.id_table	= pci_8255_pci_table,

	.id_table	= pci_8255_pci_table,

	.probe		= pci_8255_pci_probe,

	.probe		= pci_8255_pci_probe,

	.remove		= pci_8255_pci_remove,

	.remove		= comedi_pci_auto_unconfig,

};

};

module_comedi_pci_driver(pci_8255_driver, pci_8255_pci_driver);

module_comedi_pci_driver(pci_8255_driver, pci_8255_pci_driver);

drivers/staging/comedi/drivers/addi_apci_035.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -53,11 +53,6 @@ static int apci035_pci_probe(struct pci_dev *dev, 
	return comedi_pci_auto_config(dev, &apci035_driver);

	return comedi_pci_auto_config(dev, &apci035_driver);

}

}





static void apci035_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static DEFINE_PCI_DEVICE_TABLE(apci035_pci_table) = {

static DEFINE_PCI_DEVICE_TABLE(apci035_pci_table) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA,  0x0300) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA,  0x0300) },

	{ 0 }

	{ 0 }
@@ -68,7 +63,7 @@ static struct pci_driver apci035_pci_driver = { 
	.name		= "addi_apci_035",

	.name		= "addi_apci_035",

	.id_table	= apci035_pci_table,

	.id_table	= apci035_pci_table,

	.probe		= apci035_pci_probe,

	.probe		= apci035_pci_probe,

	.remove		= apci035_pci_remove,

	.remove		= comedi_pci_auto_unconfig,

};

};

module_comedi_pci_driver(apci035_driver, apci035_pci_driver);

module_comedi_pci_driver(apci035_driver, apci035_pci_driver);

drivers/staging/comedi/drivers/addi_apci_1032.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -375,11 +375,6 @@ static int apci1032_pci_probe(struct pci_dev *dev, 
	return comedi_pci_auto_config(dev, &apci1032_driver);

	return comedi_pci_auto_config(dev, &apci1032_driver);

}

}





static void apci1032_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static DEFINE_PCI_DEVICE_TABLE(apci1032_pci_table) = {

static DEFINE_PCI_DEVICE_TABLE(apci1032_pci_table) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003) },

	{ 0 }

	{ 0 }
@@ -390,7 +385,7 @@ static struct pci_driver apci1032_pci_driver = { 
	.name		= "addi_apci_1032",

	.name		= "addi_apci_1032",

	.id_table	= apci1032_pci_table,

	.id_table	= apci1032_pci_table,

	.probe		= apci1032_pci_probe,

	.probe		= apci1032_pci_probe,

	.remove		= apci1032_pci_remove,

	.remove		= comedi_pci_auto_unconfig,

};

};

module_comedi_pci_driver(apci1032_driver, apci1032_pci_driver);

module_comedi_pci_driver(apci1032_driver, apci1032_pci_driver);

drivers/staging/comedi/drivers/addi_apci_1500.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -53,11 +53,6 @@ static int apci1500_pci_probe(struct pci_dev *dev, 
	return comedi_pci_auto_config(dev, &apci1500_driver);

	return comedi_pci_auto_config(dev, &apci1500_driver);

}

}





static void apci1500_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static DEFINE_PCI_DEVICE_TABLE(apci1500_pci_table) = {

static DEFINE_PCI_DEVICE_TABLE(apci1500_pci_table) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x80fc) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x80fc) },

	{ 0 }

	{ 0 }
@@ -68,7 +63,7 @@ static struct pci_driver apci1500_pci_driver = { 
	.name		= "addi_apci_1500",

	.name		= "addi_apci_1500",

	.id_table	= apci1500_pci_table,

	.id_table	= apci1500_pci_table,

	.probe		= apci1500_pci_probe,

	.probe		= apci1500_pci_probe,

	.remove		= apci1500_pci_remove,

	.remove		= comedi_pci_auto_unconfig,

};

};

module_comedi_pci_driver(apci1500_driver, apci1500_pci_driver);

module_comedi_pci_driver(apci1500_driver, apci1500_pci_driver);

drivers/staging/comedi/drivers/addi_apci_1516.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -323,11 +323,6 @@ static int apci1516_pci_probe(struct pci_dev *dev, 
	return comedi_pci_auto_config(dev, &apci1516_driver);

	return comedi_pci_auto_config(dev, &apci1516_driver);

}

}





static void apci1516_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static DEFINE_PCI_DEVICE_TABLE(apci1516_pci_table) = {

static DEFINE_PCI_DEVICE_TABLE(apci1516_pci_table) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1016) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1016) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1516) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1516) },
@@ -340,7 +335,7 @@ static struct pci_driver apci1516_pci_driver = { 
	.name		= "addi_apci_1516",

	.name		= "addi_apci_1516",

	.id_table	= apci1516_pci_table,

	.id_table	= apci1516_pci_table,

	.probe		= apci1516_pci_probe,

	.probe		= apci1516_pci_probe,

	.remove		= apci1516_pci_remove,

	.remove		= comedi_pci_auto_unconfig,

};

};

module_comedi_pci_driver(apci1516_driver, apci1516_pci_driver);

module_comedi_pci_driver(apci1516_driver, apci1516_pci_driver);