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

Commit ed5a84cd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: isdn: remove __dev* attributes. 



CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 150632b0

drivers/isdn/hardware/avm/b1pci.c

+4 −4
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static void b1pciv4_remove(struct pci_dev *pdev) 


#endif /* CONFIG_ISDN_DRV_AVMB1_B1PCIV4 */



static int __devinit b1pci_pci_probe(struct pci_dev *pdev,

static int b1pci_pci_probe(struct pci_dev *pdev,

			   const struct pci_device_id *ent)

{

	struct capicardparams param;
@@ -344,7 +344,7 @@ static int __devinit b1pci_pci_probe(struct pci_dev *pdev, 
	return retval;

}



static void __devexit b1pci_pci_remove(struct pci_dev *pdev)

static void b1pci_pci_remove(struct pci_dev *pdev)

{

#ifdef CONFIG_ISDN_DRV_AVMB1_B1PCIV4

	avmcard *card = pci_get_drvdata(pdev);
@@ -362,7 +362,7 @@ static struct pci_driver b1pci_pci_driver = { 
	.name		= "b1pci",

	.id_table	= b1pci_pci_tbl,

	.probe		= b1pci_pci_probe,

	.remove		= __devexit_p(b1pci_pci_remove),

	.remove		= b1pci_pci_remove,

};



static struct capi_driver capi_driver_b1pci = {

drivers/isdn/hardware/avm/c4.c

+1 −2
Original line number Diff line number Diff line
@@ -1249,8 +1249,7 @@ static int c4_add_card(struct capicardparams *p, struct pci_dev *dev, 


/* ------------------------------------------------------------- */



static int __devinit c4_probe(struct pci_dev *dev,

			      const struct pci_device_id *ent)

static int c4_probe(struct pci_dev *dev, const struct pci_device_id *ent)

{

	int nr = ent->driver_data;

	int retval = 0;

drivers/isdn/hardware/avm/t1pci.c

+1 −2
Original line number Diff line number Diff line
@@ -187,8 +187,7 @@ static char *t1pci_procinfo(struct capi_ctr *ctrl) 


/* ------------------------------------------------------------- */



static int __devinit t1pci_probe(struct pci_dev *dev,

				 const struct pci_device_id *ent)

static int t1pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)

{

	struct capicardparams param;

	int retval;

drivers/isdn/hardware/eicon/divasmain.c

+4 −5
Original line number Diff line number Diff line
@@ -150,12 +150,12 @@ MODULE_DEVICE_TABLE(pci, divas_pci_tbl); 


static int divas_init_one(struct pci_dev *pdev,

			  const struct pci_device_id *ent);

static void __devexit divas_remove_one(struct pci_dev *pdev);

static void divas_remove_one(struct pci_dev *pdev);



static struct pci_driver diva_pci_driver = {

	.name     = "divas",

	.probe    = divas_init_one,

	.remove   = __devexit_p(divas_remove_one),

	.remove   = divas_remove_one,

	.id_table = divas_pci_tbl,

};
@@ -688,8 +688,7 @@ static int __init divas_register_chrdev(void) 
/* --------------------------------------------------------------------------

   PCI driver section

   -------------------------------------------------------------------------- */

static int __devinit divas_init_one(struct pci_dev *pdev,

				    const struct pci_device_id *ent)

static int divas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	void *pdiva = NULL;

	u8 pci_latency;
@@ -749,7 +748,7 @@ static int __devinit divas_init_one(struct pci_dev *pdev, 
	return (0);

}



static void __devexit divas_remove_one(struct pci_dev *pdev)

static void divas_remove_one(struct pci_dev *pdev)

{

	void *pdiva = pci_get_drvdata(pdev);

drivers/isdn/hardware/mISDN/avmfritz.c

+5 −5
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ release_card(struct fritzcard *card) 
	AVM_cnt--;

}



static int __devinit

static int

setup_instance(struct fritzcard *card)

{

	int i, err;
@@ -1096,7 +1096,7 @@ setup_instance(struct fritzcard *card) 
	return err;

}



static int __devinit

static int

fritzpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	int err = -ENOMEM;
@@ -1130,7 +1130,7 @@ fritzpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	return err;

}



static void __devexit

static void

fritz_remove_pci(struct pci_dev *pdev)

{

	struct fritzcard *card = pci_get_drvdata(pdev);
@@ -1142,7 +1142,7 @@ fritz_remove_pci(struct pci_dev *pdev) 
			pr_info("%s: drvdata already removed\n", __func__);

}



static struct pci_device_id fcpci_ids[] __devinitdata = {

static struct pci_device_id fcpci_ids[] = {

	{ PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, PCI_ANY_ID, PCI_ANY_ID,

	  0, 0, (unsigned long) "Fritz!Card PCI"},

	{ PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1_V2, PCI_ANY_ID, PCI_ANY_ID,
@@ -1154,7 +1154,7 @@ MODULE_DEVICE_TABLE(pci, fcpci_ids); 
static struct pci_driver fcpci_driver = {

	.name = "fcpci",

	.probe = fritzpci_probe,

	.remove = __devexit_p(fritz_remove_pci),

	.remove = fritz_remove_pci,

	.id_table = fcpci_ids,

};