From eef216794c51c0aaab17655f78feb33f149f06d4 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 4 Feb 2013 14:21:09 -0700 Subject: [PATCH] --- yaml --- r: 354363 b: refs/heads/master c: 7fadd565f0f84ec4402ad33546d7eec7a98220ea h: refs/heads/master i: 354361: 9cbec44cd4fe5037cce157d195f3ad3d9594f39c 354359: 86bc8e284cf1a842e80a3a6269a92581ea4ed17e v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/cb_das16_cs.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a9d62c66574f..818136e03b30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcd22e8ecee9f48f8668418cef5d523f219f7d1a +refs/heads/master: 7fadd565f0f84ec4402ad33546d7eec7a98220ea diff --git a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c index e1318faa9ebf..5bbffd9f8af9 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -477,16 +477,11 @@ static int das16cs_auto_attach(struct comedi_device *dev, return 0; } -static void das16cs_detach(struct comedi_device *dev) -{ - comedi_pcmcia_disable(dev); -} - static struct comedi_driver driver_das16cs = { .driver_name = "cb_das16_cs", .module = THIS_MODULE, .auto_attach = das16cs_auto_attach, - .detach = das16cs_detach, + .detach = comedi_pcmcia_disable, }; static int das16cs_pcmcia_attach(struct pcmcia_device *link)