Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141495
b: refs/heads/master
c: d80235c
h: refs/heads/master
i:
  141493: d11dc87
  141491: ebf70fa
  141487: abed71c
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent ad06752 commit c978ab7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 52bfe6c8e8746591e276de2594b8c98a51222d49
refs/heads/master: d80235ce8474396ec25a64b6c70e9bd8919f5cd4
16 changes: 8 additions & 8 deletions trunk/drivers/staging/comedi/drivers/rtd520.c
Original file line number Diff line number Diff line change
Expand Up @@ -266,17 +266,17 @@ static const comedi_lrange rtd_ao_range = { 4, {
/*
Board descriptions
*/
typedef struct rtdBoard_struct {
struct rtdBoard {
const char *name; /* must be first */
int device_id;
int aiChans;
int aiBits;
int aiMaxGain;
int range10Start; /* start of +-10V range */
int rangeUniStart; /* start of +10V range */
} rtdBoard;
};

static const rtdBoard rtd520Boards[] = {
static const struct rtdBoard rtd520Boards[] = {
{
name: "DM7520",
device_id : 0x7520,
Expand Down Expand Up @@ -308,13 +308,13 @@ MODULE_DEVICE_TABLE(pci, rtd520_pci_table);
/*
* Useful for shorthand access to the particular board structure
*/
#define thisboard ((const rtdBoard *)dev->board_ptr)
#define thisboard ((const struct rtdBoard *)dev->board_ptr)

/*
This structure is for data unique to this hardware driver.
This is also unique for each board in the system.
*/
typedef struct {
struct rtdPrivate {
/* memory mapped board structures */
void *las0;
void *las1;
Expand Down Expand Up @@ -358,7 +358,7 @@ typedef struct {
u8 dma1Control;
#endif /* USE_DMA */
unsigned fifoLen;
} rtdPrivate;
};

/* bit defines for "flags" */
#define SEND_EOS 0x01 /* send End Of Scan events */
Expand All @@ -377,7 +377,7 @@ typedef struct {
* most drivers define the following macro to make it easy to
* access the private structure.
*/
#define devpriv ((rtdPrivate *)dev->private)
#define devpriv ((struct rtdPrivate *)dev->private)

/* Macros to access registers */

Expand Down Expand Up @@ -739,7 +739,7 @@ static int rtd_attach(comedi_device *dev, comedi_devconfig *it)
* Allocate the private structure area. alloc_private() is a
* convenient macro defined in comedidev.h.
*/
if (alloc_private(dev, sizeof(rtdPrivate)) < 0)
if (alloc_private(dev, sizeof(struct rtdPrivate)) < 0)
return -ENOMEM;

/*
Expand Down

0 comments on commit c978ab7

Please sign in to comment.