summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorH Hartley Sweeten2013-01-25 23:00:22 +0100
committerGreg Kroah-Hartman2013-01-30 05:06:40 +0100
commitb8319710de2d3f14e11c2d951d238797e2aa489d (patch)
treec2aeba015fe3be93ee1a8198a75ddda3d247c929 /drivers/staging/comedi
parentstaging: comedi: quatech_daqp_cs: cleanup daqp_cs_attach() (diff)
downloadkernel-qcow2-linux-b8319710de2d3f14e11c2d951d238797e2aa489d.tar.gz
kernel-qcow2-linux-b8319710de2d3f14e11c2d951d238797e2aa489d.tar.xz
kernel-qcow2-linux-b8319710de2d3f14e11c2d951d238797e2aa489d.zip
staging: comedi: quatech_daqp_cs: remove casts of void *
Casting a void * is not necessary. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r--drivers/staging/comedi/drivers/quatech_daqp_cs.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index 8eea8a9ca843..39af1565c066 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -210,7 +210,7 @@ static void hex_dump(char *str, void *ptr, int len)
static int daqp_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
{
- struct local_info_t *local = (struct local_info_t *)s->private;
+ struct local_info_t *local = s->private;
if (local->stop)
return -EIO;
@@ -237,7 +237,7 @@ static int daqp_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
*/
static enum irqreturn daqp_interrupt(int irq, void *dev_id)
{
- struct local_info_t *local = (struct local_info_t *)dev_id;
+ struct local_info_t *local = dev_id;
struct comedi_device *dev;
struct comedi_subdevice *s;
int loop_limit = 10000;
@@ -265,7 +265,7 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id)
return IRQ_NONE;
}
- if ((struct local_info_t *)s->private != local) {
+ if (s->private != local) {
pr_warn("invalid comedi_subdevice.\n");
return IRQ_NONE;
}
@@ -335,7 +335,7 @@ static int daqp_ai_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- struct local_info_t *local = (struct local_info_t *)s->private;
+ struct local_info_t *local = s->private;
int i;
int v;
int counter = 10000;
@@ -528,7 +528,7 @@ static int daqp_ai_cmdtest(struct comedi_device *dev,
static int daqp_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{
- struct local_info_t *local = (struct local_info_t *)s->private;
+ struct local_info_t *local = s->private;
struct comedi_cmd *cmd = &s->async->cmd;
int counter;
int scanlist_start_on_every_entry;
@@ -730,7 +730,7 @@ static int daqp_ao_insn_write(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- struct local_info_t *local = (struct local_info_t *)s->private;
+ struct local_info_t *local = s->private;
int d;
unsigned int chan;
@@ -757,7 +757,7 @@ static int daqp_di_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- struct local_info_t *local = (struct local_info_t *)s->private;
+ struct local_info_t *local = s->private;
if (local->stop)
return -EIO;
@@ -773,7 +773,7 @@ static int daqp_do_insn_write(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- struct local_info_t *local = (struct local_info_t *)s->private;
+ struct local_info_t *local = s->private;
if (local->stop)
return -EIO;