Commit da1331a5 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: jr3_pci: rename struct poll_delay_t

Rename this private struct so it has namespace associated with the
driver.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0a44493f
...@@ -90,16 +90,16 @@ struct jr3_pci_transform { ...@@ -90,16 +90,16 @@ struct jr3_pci_transform {
} link[8]; } link[8];
}; };
struct jr3_pci_poll_delay {
int min;
int max;
};
struct jr3_pci_dev_private { struct jr3_pci_dev_private {
struct jr3_t __iomem *iobase; struct jr3_t __iomem *iobase;
struct timer_list timer; struct timer_list timer;
}; };
struct poll_delay_t {
int min;
int max;
};
struct jr3_pci_subdev_private { struct jr3_pci_subdev_private {
struct jr3_channel __iomem *channel; struct jr3_channel __iomem *channel;
unsigned long next_time_min; unsigned long next_time_min;
...@@ -124,9 +124,9 @@ struct jr3_pci_subdev_private { ...@@ -124,9 +124,9 @@ struct jr3_pci_subdev_private {
int retries; int retries;
}; };
static struct poll_delay_t poll_delay_min_max(int min, int max) static struct jr3_pci_poll_delay poll_delay_min_max(int min, int max)
{ {
struct poll_delay_t result; struct jr3_pci_poll_delay result;
result.min = min; result.min = min;
result.max = max; result.max = max;
...@@ -447,10 +447,10 @@ static int jr3_download_firmware(struct comedi_device *dev, ...@@ -447,10 +447,10 @@ static int jr3_download_firmware(struct comedi_device *dev,
return 0; return 0;
} }
static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s) static struct jr3_pci_poll_delay jr3_pci_poll_subdevice(struct comedi_subdevice *s)
{ {
struct jr3_pci_subdev_private *spriv = s->private; struct jr3_pci_subdev_private *spriv = s->private;
struct poll_delay_t result = poll_delay_min_max(1000, 2000); struct jr3_pci_poll_delay result = poll_delay_min_max(1000, 2000);
struct jr3_channel __iomem *channel; struct jr3_channel __iomem *channel;
u16 model_no; u16 model_no;
u16 serial_no; u16 serial_no;
...@@ -610,7 +610,7 @@ static void jr3_pci_poll_dev(unsigned long data) ...@@ -610,7 +610,7 @@ static void jr3_pci_poll_dev(unsigned long data)
spriv = s->private; spriv = s->private;
if (now > spriv->next_time_min) { if (now > spriv->next_time_min) {
struct poll_delay_t sub_delay; struct jr3_pci_poll_delay sub_delay;
sub_delay = jr3_pci_poll_subdevice(s); sub_delay = jr3_pci_poll_subdevice(s);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment