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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Esse commit está contido em:
@@ -904,7 +904,7 @@ Diva_card_msg(struct IsdnCardState *cs, int mt, void *arg)
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int __devinit setup_diva_common(struct IsdnCardState *cs)
|
||||
static int setup_diva_common(struct IsdnCardState *cs)
|
||||
{
|
||||
int bytecnt;
|
||||
u_char val;
|
||||
@@ -997,7 +997,7 @@ static int __devinit setup_diva_common(struct IsdnCardState *cs)
|
||||
|
||||
#ifdef CONFIG_ISA
|
||||
|
||||
static int __devinit setup_diva_isa(struct IsdnCard *card)
|
||||
static int setup_diva_isa(struct IsdnCard *card)
|
||||
{
|
||||
struct IsdnCardState *cs = card->cs;
|
||||
u_char val;
|
||||
@@ -1033,7 +1033,7 @@ static int __devinit setup_diva_isa(struct IsdnCard *card)
|
||||
|
||||
#else /* if !CONFIG_ISA */
|
||||
|
||||
static int __devinit setup_diva_isa(struct IsdnCard *card)
|
||||
static int setup_diva_isa(struct IsdnCard *card)
|
||||
{
|
||||
return (-1); /* card not found; continue search */
|
||||
}
|
||||
@@ -1041,7 +1041,7 @@ static int __devinit setup_diva_isa(struct IsdnCard *card)
|
||||
#endif /* CONFIG_ISA */
|
||||
|
||||
#ifdef __ISAPNP__
|
||||
static struct isapnp_device_id diva_ids[] __devinitdata = {
|
||||
static struct isapnp_device_id diva_ids[] = {
|
||||
{ ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51),
|
||||
ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51),
|
||||
(unsigned long) "Diva picola" },
|
||||
@@ -1063,10 +1063,10 @@ static struct isapnp_device_id diva_ids[] __devinitdata = {
|
||||
{ 0, }
|
||||
};
|
||||
|
||||
static struct isapnp_device_id *ipid __devinitdata = &diva_ids[0];
|
||||
static struct pnp_card *pnp_c __devinitdata = NULL;
|
||||
static struct isapnp_device_id *ipid = &diva_ids[0];
|
||||
static struct pnp_card *pnp_c = NULL;
|
||||
|
||||
static int __devinit setup_diva_isapnp(struct IsdnCard *card)
|
||||
static int setup_diva_isapnp(struct IsdnCard *card)
|
||||
{
|
||||
struct IsdnCardState *cs = card->cs;
|
||||
struct pnp_dev *pnp_d;
|
||||
@@ -1141,7 +1141,7 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card)
|
||||
|
||||
#else /* if !ISAPNP */
|
||||
|
||||
static int __devinit setup_diva_isapnp(struct IsdnCard *card)
|
||||
static int setup_diva_isapnp(struct IsdnCard *card)
|
||||
{
|
||||
return (-1); /* card not found; continue search */
|
||||
}
|
||||
@@ -1149,12 +1149,12 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card)
|
||||
#endif /* ISAPNP */
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
static struct pci_dev *dev_diva __devinitdata = NULL;
|
||||
static struct pci_dev *dev_diva_u __devinitdata = NULL;
|
||||
static struct pci_dev *dev_diva201 __devinitdata = NULL;
|
||||
static struct pci_dev *dev_diva202 __devinitdata = NULL;
|
||||
static struct pci_dev *dev_diva = NULL;
|
||||
static struct pci_dev *dev_diva_u = NULL;
|
||||
static struct pci_dev *dev_diva201 = NULL;
|
||||
static struct pci_dev *dev_diva202 = NULL;
|
||||
|
||||
static int __devinit setup_diva_pci(struct IsdnCard *card)
|
||||
static int setup_diva_pci(struct IsdnCard *card)
|
||||
{
|
||||
struct IsdnCardState *cs = card->cs;
|
||||
|
||||
@@ -1231,15 +1231,14 @@ static int __devinit setup_diva_pci(struct IsdnCard *card)
|
||||
|
||||
#else /* if !CONFIG_PCI */
|
||||
|
||||
static int __devinit setup_diva_pci(struct IsdnCard *card)
|
||||
static int setup_diva_pci(struct IsdnCard *card)
|
||||
{
|
||||
return (-1); /* card not found; continue search */
|
||||
}
|
||||
|
||||
#endif /* CONFIG_PCI */
|
||||
|
||||
int __devinit
|
||||
setup_diva(struct IsdnCard *card)
|
||||
int setup_diva(struct IsdnCard *card)
|
||||
{
|
||||
int rc, have_card = 0;
|
||||
struct IsdnCardState *cs = card->cs;
|
||||
|
Referência em uma nova issue
Block a user