From 5a41f03bc2b289888b8b7e52a078a391d5c53c01 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 25 Jan 2013 14:59:56 -0700 Subject: [PATCH] --- yaml --- r: 354231 b: refs/heads/master c: cdcc02291bea28b85b81230cb9bd328ab7a3cb35 h: refs/heads/master i: 354229: f8102bcc44a302c0ad0ce6aad7df852e3df4c6a8 354227: d8b2ae8746d2bd2c68edb861273cf5e523ad4e62 354223: d46686d43b123f29714c68fc059ff42369fa0535 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/quatech_daqp_cs.c | 53 ++++++++----------- 2 files changed, 22 insertions(+), 33 deletions(-) diff --git a/[refs] b/[refs] index 68c9a1c371e2..a1be832c6fb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86be5680f5804690654519751ed77aaa54b01826 +refs/heads/master: cdcc02291bea28b85b81230cb9bd328ab7a3cb35 diff --git a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c index b2b755f031b1..8eea8a9ca843 100644 --- a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -944,41 +944,12 @@ static int daqp_pcmcia_config_loop(struct pcmcia_device *p_dev, void *priv_data) return pcmcia_request_io(p_dev); } -static void daqp_cs_config(struct pcmcia_device *link) -{ - int ret; - - dev_dbg(&link->dev, "daqp_cs_config\n"); - - link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO; - - ret = pcmcia_loop_config(link, daqp_pcmcia_config_loop, NULL); - if (ret) { - dev_warn(&link->dev, "no configuration found\n"); - goto failed; - } - - ret = pcmcia_request_irq(link, daqp_interrupt); - if (ret) - goto failed; - - ret = pcmcia_enable_device(link); - if (ret) - goto failed; - - return; - -failed: - pcmcia_disable_device(link); -} - static int daqp_cs_attach(struct pcmcia_device *link) { struct local_info_t *local; + int ret; int i; - dev_dbg(&link->dev, "daqp_cs_attach()\n"); - for (i = 0; i < MAX_DEV; i++) if (dev_table[i] == NULL) break; @@ -988,7 +959,7 @@ static int daqp_cs_attach(struct pcmcia_device *link) } /* Allocate space for private device-specific data */ - local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); + local = kzalloc(sizeof(*local), GFP_KERNEL); if (!local) return -ENOMEM; @@ -997,9 +968,27 @@ static int daqp_cs_attach(struct pcmcia_device *link) local->link = link; link->priv = local; - daqp_cs_config(link); + link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO; + + ret = pcmcia_loop_config(link, daqp_pcmcia_config_loop, NULL); + if (ret) { + dev_warn(&link->dev, "no configuration found\n"); + goto failed; + } + + ret = pcmcia_request_irq(link, daqp_interrupt); + if (ret) + goto failed; + + ret = pcmcia_enable_device(link); + if (ret) + goto failed; return 0; + +failed: + pcmcia_disable_device(link); + return ret; } static void daqp_cs_detach(struct pcmcia_device *link)