Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141633
b: refs/heads/master
c: 83101a1
h: refs/heads/master
i:
  141631: 414aaed
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent f984be4 commit 3f836f3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 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: 352dec620aea9529180034fa461d290026ff57e9
refs/heads/master: 83101a1770982817ecbcb7679439352795bc7a47
16 changes: 9 additions & 7 deletions trunk/drivers/staging/comedi/drivers/jr3_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,12 @@ struct jr3_pci_dev_private {
};


typedef struct {
struct poll_delay_t {

int min;
int max;
} poll_delay_t;
};


typedef struct {
volatile struct jr3_channel *channel;
Expand All @@ -166,9 +168,9 @@ typedef struct {
int retries;
} jr3_pci_subdev_private;

static poll_delay_t poll_delay_min_max(int min, int max)
static struct poll_delay_t poll_delay_min_max(int min, int max)
{
poll_delay_t result;
struct poll_delay_t result;

result.min = min;
result.max = max;
Expand Down Expand Up @@ -525,9 +527,9 @@ static int jr3_download_firmware(struct comedi_device * dev, const u8 * data,
return result;
}

static poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice * s)
static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice * s)
{
poll_delay_t result = poll_delay_min_max(1000, 2000);
struct poll_delay_t result = poll_delay_min_max(1000, 2000);
jr3_pci_subdev_private *p = s->private;

if (p) {
Expand Down Expand Up @@ -752,7 +754,7 @@ static void jr3_pci_poll_dev(unsigned long data)
for (i = 0; i < devpriv->n_channels; i++) {
jr3_pci_subdev_private *subdevpriv = dev->subdevices[i].private;
if (now > subdevpriv->next_time_min) {
poll_delay_t sub_delay;
struct poll_delay_t sub_delay;

sub_delay = jr3_pci_poll_subdevice(&dev->subdevices[i]);
subdevpriv->next_time_min =
Expand Down

0 comments on commit 3f836f3

Please sign in to comment.