Skip to content

Commit

Permalink
Staging: comedi: Remove dio200_subdev_8254 typedef
Browse files Browse the repository at this point in the history
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 692560d commit 93ba42e
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions drivers/staging/comedi/drivers/amplc_dio200.c
Original file line number Diff line number Diff line change
Expand Up @@ -446,15 +446,15 @@ struct dio200_private {

#define devpriv ((struct dio200_private *)dev->private)

typedef struct {
struct dio200_subdev_8254 {
unsigned long iobase; /* Counter base address */
unsigned long clk_sce_iobase; /* CLK_SCE base address */
unsigned long gat_sce_iobase; /* GAT_SCE base address */
int which; /* Bit 5 of CLK_SCE or GAT_SCE */
int has_clk_gat_sce;
unsigned clock_src[3]; /* Current clock sources */
unsigned gate_src[3]; /* Current gate sources */
} dio200_subdev_8254;
};

typedef struct {
unsigned long iobase;
Expand Down Expand Up @@ -1036,7 +1036,7 @@ static int
dio200_subdev_8254_read(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_insn * insn, unsigned int * data)
{
dio200_subdev_8254 *subpriv = s->private;
struct dio200_subdev_8254 *subpriv = s->private;
int chan = CR_CHAN(insn->chanspec);

data[0] = i8254_read(subpriv->iobase, 0, chan);
Expand All @@ -1051,7 +1051,7 @@ static int
dio200_subdev_8254_write(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_insn * insn, unsigned int * data)
{
dio200_subdev_8254 *subpriv = s->private;
struct dio200_subdev_8254 *subpriv = s->private;
int chan = CR_CHAN(insn->chanspec);

i8254_write(subpriv->iobase, 0, chan, data[0]);
Expand All @@ -1063,7 +1063,7 @@ dio200_subdev_8254_write(struct comedi_device * dev, struct comedi_subdevice * s
* Set gate source for an '8254' counter subdevice channel.
*/
static int
dio200_set_gate_src(dio200_subdev_8254 * subpriv, unsigned int counter_number,
dio200_set_gate_src(struct dio200_subdev_8254 * subpriv, unsigned int counter_number,
unsigned int gate_src)
{
unsigned char byte;
Expand All @@ -1086,7 +1086,7 @@ dio200_set_gate_src(dio200_subdev_8254 * subpriv, unsigned int counter_number,
* Get gate source for an '8254' counter subdevice channel.
*/
static int
dio200_get_gate_src(dio200_subdev_8254 * subpriv, unsigned int counter_number)
dio200_get_gate_src(struct dio200_subdev_8254 * subpriv, unsigned int counter_number)
{
if (!subpriv->has_clk_gat_sce)
return -1;
Expand All @@ -1100,7 +1100,7 @@ dio200_get_gate_src(dio200_subdev_8254 * subpriv, unsigned int counter_number)
* Set clock source for an '8254' counter subdevice channel.
*/
static int
dio200_set_clock_src(dio200_subdev_8254 * subpriv, unsigned int counter_number,
dio200_set_clock_src(struct dio200_subdev_8254 * subpriv, unsigned int counter_number,
unsigned int clock_src)
{
unsigned char byte;
Expand All @@ -1123,7 +1123,7 @@ dio200_set_clock_src(dio200_subdev_8254 * subpriv, unsigned int counter_number,
* Get clock source for an '8254' counter subdevice channel.
*/
static int
dio200_get_clock_src(dio200_subdev_8254 * subpriv, unsigned int counter_number,
dio200_get_clock_src(struct dio200_subdev_8254 * subpriv, unsigned int counter_number,
unsigned int * period_ns)
{
unsigned clock_src;
Expand All @@ -1145,7 +1145,7 @@ static int
dio200_subdev_8254_config(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_insn * insn, unsigned int * data)
{
dio200_subdev_8254 *subpriv = s->private;
struct dio200_subdev_8254 *subpriv = s->private;
int ret;
int chan = CR_CHAN(insn->chanspec);

Expand Down Expand Up @@ -1197,7 +1197,7 @@ static int
dio200_subdev_8254_init(struct comedi_device * dev, struct comedi_subdevice * s,
unsigned long iobase, unsigned offset, int has_clk_gat_sce)
{
dio200_subdev_8254 *subpriv;
struct dio200_subdev_8254 *subpriv;
unsigned int chan;

subpriv = kzalloc(sizeof(*subpriv), GFP_KERNEL);
Expand Down

0 comments on commit 93ba42e

Please sign in to comment.