From 5c372993a01f8fbb490c7b5784b4f9537802b236 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 13 Jun 2012 15:43:04 -0700 Subject: [PATCH] --- yaml --- r: 317369 b: refs/heads/master c: cf8a6b3d86ec4d6ac8e2925a65335bd0d155c480 h: refs/heads/master i: 317367: c6d545ec247507569ce1db5ea117058588ac4a95 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/8255.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ae49618895a8..2f0b893b1611 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9af899b0c6c778083d1040349930a0f9fffb525 +refs/heads/master: cf8a6b3d86ec4d6ac8e2925a65335bd0d155c480 diff --git a/trunk/drivers/staging/comedi/drivers/8255.c b/trunk/drivers/staging/comedi/drivers/8255.c index abbb6d4d10d1..8c97ac1e6970 100644 --- a/trunk/drivers/staging/comedi/drivers/8255.c +++ b/trunk/drivers/staging/comedi/drivers/8255.c @@ -169,7 +169,8 @@ static int subdev_8255_insn(struct comedi_device *dev, return insn->n; } -static void do_config(struct comedi_device *dev, struct comedi_subdevice *s) +static void subdev_8255_do_config(struct comedi_device *dev, + struct comedi_subdevice *s) { struct subdev_8255_private *spriv = s->private; unsigned long iobase = spriv->iobase; @@ -221,7 +222,7 @@ static int subdev_8255_insn_config(struct comedi_device *dev, return -EINVAL; } - do_config(dev, s); + subdev_8255_do_config(dev, s); return 1; } @@ -344,7 +345,7 @@ int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice *s, s->state = 0; s->io_bits = 0; - do_config(dev, s); + subdev_8255_do_config(dev, s); return 0; }