drivers/staging/comedi: dev_node removal (ni_labpc_cs)
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Родитель
78950591e4
Коммит
99bd8f2222
|
@ -199,7 +199,6 @@ static const dev_info_t dev_info = "daqcard-1200";
|
||||||
|
|
||||||
struct local_info_t {
|
struct local_info_t {
|
||||||
struct pcmcia_device *link;
|
struct pcmcia_device *link;
|
||||||
dev_node_t node;
|
|
||||||
int stop;
|
int stop;
|
||||||
struct bus_operations *bus;
|
struct bus_operations *bus;
|
||||||
};
|
};
|
||||||
|
@ -265,10 +264,8 @@ static void labpc_cs_detach(struct pcmcia_device *link)
|
||||||
the release() function is called, that will trigger a proper
|
the release() function is called, that will trigger a proper
|
||||||
detach().
|
detach().
|
||||||
*/
|
*/
|
||||||
if (link->dev_node) {
|
|
||||||
((struct local_info_t *)link->priv)->stop = 1;
|
((struct local_info_t *)link->priv)->stop = 1;
|
||||||
labpc_release(link);
|
labpc_release(link);
|
||||||
}
|
|
||||||
|
|
||||||
/* This points to the parent local_info_t struct (may be null) */
|
/* This points to the parent local_info_t struct (may be null) */
|
||||||
kfree(link->priv);
|
kfree(link->priv);
|
||||||
|
@ -350,7 +347,6 @@ static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
|
||||||
|
|
||||||
static void labpc_config(struct pcmcia_device *link)
|
static void labpc_config(struct pcmcia_device *link)
|
||||||
{
|
{
|
||||||
struct local_info_t *dev = link->priv;
|
|
||||||
int ret;
|
int ret;
|
||||||
win_req_t req;
|
win_req_t req;
|
||||||
|
|
||||||
|
@ -374,17 +370,8 @@ static void labpc_config(struct pcmcia_device *link)
|
||||||
if (ret)
|
if (ret)
|
||||||
goto failed;
|
goto failed;
|
||||||
|
|
||||||
/*
|
|
||||||
At this point, the dev_node_t structure(s) need to be
|
|
||||||
initialized and arranged in a linked list at link->dev.
|
|
||||||
*/
|
|
||||||
sprintf(dev->node.dev_name, "daqcard-1200");
|
|
||||||
dev->node.major = dev->node.minor = 0;
|
|
||||||
link->dev_node = &dev->node;
|
|
||||||
|
|
||||||
/* Finally, report what we've done */
|
/* Finally, report what we've done */
|
||||||
printk(KERN_INFO "%s: index 0x%02x",
|
dev_info(&link->dev, "index 0x%02x", link->conf.ConfigIndex);
|
||||||
dev->node.dev_name, link->conf.ConfigIndex);
|
|
||||||
if (link->conf.Attributes & CONF_ENABLE_IRQ)
|
if (link->conf.Attributes & CONF_ENABLE_IRQ)
|
||||||
printk(", irq %d", link->irq);
|
printk(", irq %d", link->irq);
|
||||||
if (link->io.NumPorts1)
|
if (link->io.NumPorts1)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче