Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4623c3e0 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging: comedi/daqboard2000: use mdelay for large delays 



On ARM, it is not legal to pass values larger than 2ms into udelay(),
and mdelay() must be used instead, to avoid this build error:

ERROR: "__bad_udelay" [drivers/staging/comedi/drivers/daqboard2000.ko]
undefined!

On a related note, any use of mdelay() or large udelay() numbers should
be carefully reviewed, and replaced with msleep() or a different
implementation that does not rely on delaying the work.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 14d7547c

drivers/staging/comedi/drivers/daqboard2000.c

+7 −7
Original line number Diff line number Diff line
@@ -462,9 +462,9 @@ static void daqboard2000_resetLocalBus(struct comedi_device *dev) 
	struct daqboard2000_private *devpriv = dev->private;



	writel(DAQBOARD2000_SECRLocalBusHi, devpriv->plx + 0x6c);

	udelay(10000);

	mdelay(10);

	writel(DAQBOARD2000_SECRLocalBusLo, devpriv->plx + 0x6c);

	udelay(10000);

	mdelay(10);

}



static void daqboard2000_reloadPLX(struct comedi_device *dev)
@@ -472,11 +472,11 @@ static void daqboard2000_reloadPLX(struct comedi_device *dev) 
	struct daqboard2000_private *devpriv = dev->private;



	writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c);

	udelay(10000);

	mdelay(10);

	writel(DAQBOARD2000_SECRReloadHi, devpriv->plx + 0x6c);

	udelay(10000);

	mdelay(10);

	writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c);

	udelay(10000);

	mdelay(10);

}



static void daqboard2000_pulseProgPin(struct comedi_device *dev)
@@ -484,9 +484,9 @@ static void daqboard2000_pulseProgPin(struct comedi_device *dev) 
	struct daqboard2000_private *devpriv = dev->private;



	writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c);

	udelay(10000);

	mdelay(10);

	writel(DAQBOARD2000_SECRProgPinLo, devpriv->plx + 0x6c);

	udelay(10000);	/* Not in the original code, but I like symmetry... */

	mdelay(10);	/* Not in the original code, but I like symmetry... */

}



static int daqboard2000_pollCPLD(struct comedi_device *dev, int mask)