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>
这个提交包含在:
@@ -62,9 +62,9 @@ MODULE_LICENSE("Dual MPL/GPL");
|
||||
static int protocol = 2; /* EURO-ISDN Default */
|
||||
module_param(protocol, int, 0);
|
||||
|
||||
static int elsa_cs_config(struct pcmcia_device *link) __devinit;
|
||||
static int elsa_cs_config(struct pcmcia_device *link);
|
||||
static void elsa_cs_release(struct pcmcia_device *link);
|
||||
static void elsa_cs_detach(struct pcmcia_device *p_dev) __devexit;
|
||||
static void elsa_cs_detach(struct pcmcia_device *p_dev);
|
||||
|
||||
typedef struct local_info_t {
|
||||
struct pcmcia_device *p_dev;
|
||||
@@ -72,7 +72,7 @@ typedef struct local_info_t {
|
||||
int cardnr;
|
||||
} local_info_t;
|
||||
|
||||
static int __devinit elsa_cs_probe(struct pcmcia_device *link)
|
||||
static int elsa_cs_probe(struct pcmcia_device *link)
|
||||
{
|
||||
local_info_t *local;
|
||||
|
||||
@@ -90,7 +90,7 @@ static int __devinit elsa_cs_probe(struct pcmcia_device *link)
|
||||
return elsa_cs_config(link);
|
||||
} /* elsa_cs_attach */
|
||||
|
||||
static void __devexit elsa_cs_detach(struct pcmcia_device *link)
|
||||
static void elsa_cs_detach(struct pcmcia_device *link)
|
||||
{
|
||||
local_info_t *info = link->priv;
|
||||
|
||||
@@ -126,7 +126,7 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int __devinit elsa_cs_config(struct pcmcia_device *link)
|
||||
static int elsa_cs_config(struct pcmcia_device *link)
|
||||
{
|
||||
int i;
|
||||
IsdnCard_t icard;
|
||||
@@ -210,7 +210,7 @@ static struct pcmcia_driver elsa_cs_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "elsa_cs",
|
||||
.probe = elsa_cs_probe,
|
||||
.remove = __devexit_p(elsa_cs_detach),
|
||||
.remove = elsa_cs_detach,
|
||||
.id_table = elsa_ids,
|
||||
.suspend = elsa_suspend,
|
||||
.resume = elsa_resume,
|
||||
|
在新工单中引用
屏蔽一个用户