Commit f61bb62e authored by Henne's avatar Henne Committed by David S. Miller

isdn: Cleanup Sections in PCMCIA driver elsa

Compiling this driver gave a section mismatch,
so I reviewed the init/exit paths of the driver
and made the correct changes.

WARNING: drivers/isdn/hisax/built-in.o(.text+0x55e37): Section mismatch
in reference from the function elsa_cs_config() to the function
.devinit.text:hisax_init_pcmcia()
The function elsa_cs_config() references
the function __devinit hisax_init_pcmcia().
This is often because elsa_cs_config lacks a __devinit
annotation or the annotation of hisax_init_pcmcia is wrong.
Signed-off-by: default avatarHenrik Kretzschmar <henne@nachtwindheim.de>
Acked-by: default avatarKarsten Keil <keil@b1-systems.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a465870a
...@@ -76,7 +76,7 @@ module_param(protocol, int, 0); ...@@ -76,7 +76,7 @@ module_param(protocol, int, 0);
handler. handler.
*/ */
static int elsa_cs_config(struct pcmcia_device *link); static int elsa_cs_config(struct pcmcia_device *link) __devinit ;
static void elsa_cs_release(struct pcmcia_device *link); static void elsa_cs_release(struct pcmcia_device *link);
/* /*
...@@ -85,7 +85,7 @@ static void elsa_cs_release(struct pcmcia_device *link); ...@@ -85,7 +85,7 @@ static void elsa_cs_release(struct pcmcia_device *link);
needed to manage one actual PCMCIA card. needed to manage one actual PCMCIA card.
*/ */
static void elsa_cs_detach(struct pcmcia_device *p_dev); static void elsa_cs_detach(struct pcmcia_device *p_dev) __devexit;
/* /*
A driver needs to provide a dev_node_t structure for each device A driver needs to provide a dev_node_t structure for each device
...@@ -121,7 +121,7 @@ typedef struct local_info_t { ...@@ -121,7 +121,7 @@ typedef struct local_info_t {
======================================================================*/ ======================================================================*/
static int elsa_cs_probe(struct pcmcia_device *link) static int __devinit elsa_cs_probe(struct pcmcia_device *link)
{ {
local_info_t *local; local_info_t *local;
...@@ -166,7 +166,7 @@ static int elsa_cs_probe(struct pcmcia_device *link) ...@@ -166,7 +166,7 @@ static int elsa_cs_probe(struct pcmcia_device *link)
======================================================================*/ ======================================================================*/
static void elsa_cs_detach(struct pcmcia_device *link) static void __devexit elsa_cs_detach(struct pcmcia_device *link)
{ {
local_info_t *info = link->priv; local_info_t *info = link->priv;
...@@ -210,7 +210,7 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev, ...@@ -210,7 +210,7 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev,
return -ENODEV; return -ENODEV;
} }
static int elsa_cs_config(struct pcmcia_device *link) static int __devinit elsa_cs_config(struct pcmcia_device *link)
{ {
local_info_t *dev; local_info_t *dev;
int i; int i;
...@@ -327,7 +327,7 @@ static struct pcmcia_driver elsa_cs_driver = { ...@@ -327,7 +327,7 @@ static struct pcmcia_driver elsa_cs_driver = {
.name = "elsa_cs", .name = "elsa_cs",
}, },
.probe = elsa_cs_probe, .probe = elsa_cs_probe,
.remove = elsa_cs_detach, .remove = __devexit_p(elsa_cs_detach),
.id_table = elsa_ids, .id_table = elsa_ids,
.suspend = elsa_suspend, .suspend = elsa_suspend,
.resume = elsa_resume, .resume = elsa_resume,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment