Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337335
b: refs/heads/master
c: e33909c
h: refs/heads/master
i:
  337333: 2f02a46
  337331: 0792c91
  337327: 1b096e9
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 26, 2012
1 parent 00e5b48 commit b834b7d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 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: 61532e9d6e8536a6cd05eb2d38eb84ebf08784af
refs/heads/master: e33909c6d43b3f3913a5d5a370d9ff1335e4bd58
18 changes: 0 additions & 18 deletions trunk/drivers/staging/comedi/drivers/me_daq.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ static const struct me_board me_boards[] = {
}
};

/* Private data structure */
struct me_private_data {
void __iomem *plx_regbase; /* PLX configuration base address */
void __iomem *me_regbase; /* Base address of the Meilhaus card */
Expand All @@ -175,13 +174,6 @@ struct me_private_data {
int ao_readback[4]; /* Mirror of analog output data */
};

/*
* ------------------------------------------------------------------
*
* Helpful functions
*
* ------------------------------------------------------------------
*/
static inline void sleep(unsigned sec)
{
current->state = TASK_INTERRUPTIBLE;
Expand Down Expand Up @@ -393,15 +385,6 @@ static int me_ao_insn_read(struct comedi_device *dev,
return insn->n;
}

/*
* ------------------------------------------------------------------
*
* INITIALISATION SECTION
*
* ------------------------------------------------------------------
*/

/* Xilinx firmware download for card: ME-2600i */
static int me2600_xilinx_download(struct comedi_device *dev,
const u8 *data, size_t size)
{
Expand Down Expand Up @@ -485,7 +468,6 @@ static int me2600_upload_firmware(struct comedi_device *dev)
return ret;
}

/* Reset device */
static int me_reset(struct comedi_device *dev)
{
struct me_private_data *dev_private = dev->private;
Expand Down

0 comments on commit b834b7d

Please sign in to comment.