From 485e897b97c6951aabde09d9a702113000a9e217 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 14 Sep 2012 17:34:18 +0100 Subject: [PATCH] --- yaml --- r: 325303 b: refs/heads/master c: 5b6137d8807524c9ecd9a35ff77421ab52a8e955 h: refs/heads/master i: 325301: 9d580b877c8bbb55dbe820ca9a855d4bec407a44 325299: 42087bb64b624db1b099f8e721ed2ed9456a69c9 325295: 8eeb38f2d5e463957cdeb1c9b225cf077c5dd009 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_atmio.c | 2 +- trunk/drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- trunk/drivers/staging/comedi/drivers/ni_mio_cs.c | 2 +- trunk/drivers/staging/comedi/drivers/ni_pcimio.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 62787db68a55..2080e3f0f31b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21b74c2785c4bb28d42ce78ae15d06749e9bedfb +refs/heads/master: 5b6137d8807524c9ecd9a35ff77421ab52a8e955 diff --git a/trunk/drivers/staging/comedi/drivers/ni_atmio.c b/trunk/drivers/staging/comedi/drivers/ni_atmio.c index 6448373878ed..cac25572f6bb 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_atmio.c +++ b/trunk/drivers/staging/comedi/drivers/ni_atmio.c @@ -489,7 +489,7 @@ static int ni_atmio_attach(struct comedi_device *dev, /* generic E series stuff in ni_mio_common.c */ - ret = ni_E_init(dev, it); + ret = ni_E_init(dev); if (ret < 0) return ret; diff --git a/trunk/drivers/staging/comedi/drivers/ni_mio_common.c b/trunk/drivers/staging/comedi/drivers/ni_mio_common.c index 68f3bddaf753..8fd967aec3b3 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/trunk/drivers/staging/comedi/drivers/ni_mio_common.c @@ -4404,7 +4404,7 @@ static int ni_alloc_private(struct comedi_device *dev) return 0; }; -static int ni_E_init(struct comedi_device *dev, struct comedi_devconfig *it) +static int ni_E_init(struct comedi_device *dev) { struct comedi_subdevice *s; unsigned j; diff --git a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c index b85765d266c2..9acaad2c5821 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c @@ -382,7 +382,7 @@ static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it) devpriv->stc_writel = &win_out2; devpriv->stc_readl = &win_in2; - ret = ni_E_init(dev, it); + ret = ni_E_init(dev); if (ret < 0) return ret; diff --git a/trunk/drivers/staging/comedi/drivers/ni_pcimio.c b/trunk/drivers/staging/comedi/drivers/ni_pcimio.c index 89f4d43c6d08..fa008fa9401e 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/trunk/drivers/staging/comedi/drivers/ni_pcimio.c @@ -1659,7 +1659,7 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it) } } - ret = ni_E_init(dev, it); + ret = ni_E_init(dev); if (ret < 0) return ret;