projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
[cascardo/linux.git]
/
drivers
/
staging
/
comedi
/
drivers
/
das08_cs.c
diff --git
a/drivers/staging/comedi/drivers/das08_cs.c
b/drivers/staging/comedi/drivers/das08_cs.c
index
9ee677f
..
c6aa52f
100644
(file)
--- a/
drivers/staging/comedi/drivers/das08_cs.c
+++ b/
drivers/staging/comedi/drivers/das08_cs.c
@@
-131,14
+131,6
@@
static void das08_pcmcia_detach(struct pcmcia_device *);
less on other parts of the kernel.
*/
less on other parts of the kernel.
*/
-/*
- The dev_info variable is the "key" that is used to match up this
- device driver with appropriate cards, through the card configuration
- database.
-*/
-
-static const dev_info_t dev_info = "pcm-das08";
-
struct local_info_t {
struct pcmcia_device *link;
int stop;
struct local_info_t {
struct pcmcia_device *link;
int stop;
@@
-205,8
+197,7
@@
static void das08_pcmcia_detach(struct pcmcia_device *link)
das08_pcmcia_release(link);
/* This points to the parent struct local_info_t struct */
das08_pcmcia_release(link);
/* This points to the parent struct local_info_t struct */
- if (link->priv)
- kfree(link->priv);
+ kfree(link->priv);
} /* das08_pcmcia_detach */
} /* das08_pcmcia_detach */
@@
-359,7
+350,7
@@
struct pcmcia_driver das08_cs_driver = {
.id_table = das08_cs_id_table,
.owner = THIS_MODULE,
.drv = {
.id_table = das08_cs_id_table,
.owner = THIS_MODULE,
.drv = {
- .name =
dev_info
,
+ .name =
"pcm-das08"
,
},
};
},
};