summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/jr3_pci.h
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2017-03-08 18:44:26 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-12 14:57:00 +0100
commit6c7f58084fce3f07d4954555173171348ddff8f5 (patch)
treedb0a28a9ec10a6813e36f1437972096b95258cee /drivers/staging/comedi/drivers/jr3_pci.h
parentef3ab9f85c9c3ed3eb2ef8c07ce969a5ce861ec6 (diff)
staging: comedi: jr3_pci: rename 'channel' to 'block'
The term "channel" is overloaded in this driver. Rename the `channel` member of `struct jr3_t` to `block` to reduce confusion. `block` is an array of an anonymous `struct` type, with each element covering the registers for one subdevice. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/jr3_pci.h')
-rw-r--r--drivers/staging/comedi/drivers/jr3_pci.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/jr3_pci.h b/drivers/staging/comedi/drivers/jr3_pci.h
index b4d333d57185..ab40828df6ea 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.h
+++ b/drivers/staging/comedi/drivers/jr3_pci.h
@@ -732,5 +732,5 @@ struct jr3_t {
u32 program_hi[0x8000]; /* 0x40000 - 0x60000 */
u32 reset; /* 0x60000 - 0x60004 */
char pad3[0x20000 - 0x00004]; /* 0x60004 - 0x80000 */
- } channel[4];
+ } block[4];
};