Skip to content

Commit

Permalink
Staging: comedi: Remove dio200_layout 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 3d7a42e commit af105ad
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/staging/comedi/drivers/amplc_dio200.c
Original file line number Diff line number Diff line change
Expand Up @@ -355,15 +355,15 @@ enum dio200_sdtype { sd_none, sd_intr, sd_8255, sd_8254 };
#define DIO200_MAX_SUBDEVS 7
#define DIO200_MAX_ISNS 6

typedef struct dio200_layout_struct {
struct dio200_layout_struct {
unsigned short n_subdevs; /* number of subdevices */
unsigned char sdtype[DIO200_MAX_SUBDEVS]; /* enum dio200_sdtype */
unsigned char sdinfo[DIO200_MAX_SUBDEVS]; /* depends on sdtype */
char has_int_sce; /* has interrupt enable/status register */
char has_clk_gat_sce; /* has clock/gate selection registers */
} dio200_layout;
};

static const dio200_layout dio200_layouts[] = {
static const struct dio200_layout_struct dio200_layouts[] = {
[pc212_layout] = {
n_subdevs:6,
sdtype: {sd_8255, sd_8254, sd_8254, sd_8254,
Expand Down Expand Up @@ -1271,7 +1271,7 @@ static int dio200_attach(struct comedi_device * dev, struct comedi_devconfig * i
struct pci_dev *pci_dev = NULL;
int bus = 0, slot = 0;
#endif
const dio200_layout *layout;
const struct dio200_layout_struct *layout;
int share_irq = 0;
int sdx;
unsigned n;
Expand Down Expand Up @@ -1431,7 +1431,7 @@ static int dio200_attach(struct comedi_device * dev, struct comedi_devconfig * i
*/
static int dio200_detach(struct comedi_device * dev)
{
const dio200_layout *layout;
const struct dio200_layout_struct *layout;
unsigned n;

printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor,
Expand Down

0 comments on commit af105ad

Please sign in to comment.