Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317077
b: refs/heads/master
c: ad401db
h: refs/heads/master
i:
  317075: 8781112
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 5, 2012
1 parent b8147cc commit 7eddc16
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 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: 42caa910f286e2be0763a6fb8aa7a998e10c6e02
refs/heads/master: ad401db6684bef91aca6304e640d63c9c858de2b
13 changes: 2 additions & 11 deletions trunk/drivers/staging/comedi/drivers/ssv_dnp.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ struct dnp_board {
int have_dio;
};

/* Useful for shorthand access to the particular board structure ----------- */
#define thisboard ((const struct dnp_board *)dev->board_ptr)

/* This structure is for data unique to the DNP driver --------------------- */
struct dnp_private_data {

Expand Down Expand Up @@ -188,18 +185,12 @@ static int dnp_dio_insn_config(struct comedi_device *dev,

static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
const struct dnp_board *board = comedi_board(dev);
struct comedi_subdevice *s;

printk(KERN_INFO "comedi%d: dnp: ", dev->minor);

/* Autoprobing: this should find out which board we have. Currently */
/* only the 1486 board is supported and autoprobing is not */
/* implemented :-) */
/* dev->board_ptr = dnp_probe(dev); */

/* Initialize the name of the board. */
/* We can use the "thisboard" macro now. */
dev->board_name = thisboard->name;
dev->board_name = board->name;

/* Allocate the private structure area. alloc_private() is a */
/* convenient macro defined in comedidev.h. */
Expand Down

0 comments on commit 7eddc16

Please sign in to comment.