staging: comedi: drivers: replace SDF_WRITEABLE with SDF_WRITABLE

As indicated in the comedi.h uapi header, SDF_WRITEABLE was a spelling
error in the API, SDF_WRITABLE is prefered.

For aesthetics, replace all the SDF_WRITEABLE uses with SDF_WRITABLE.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c
index de8d74fc6335ad2d72749bd14954a4915a4365ad..d43129c9fda02d5b84bab4074f878fb2da1547c6 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1500.c
@@ -66,8 +66,7 @@ static int apci1500_auto_attach(struct comedi_device *dev,
        /*  Allocate and Initialise DO Subdevice Structures */
        s = &dev->subdevices[1];
        s->type = COMEDI_SUBD_DO;
-       s->subdev_flags =
-               SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+       s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 16;
        s->maxdata = 1;
        s->range_table = &range_digital;
@@ -78,7 +77,7 @@ static int apci1500_auto_attach(struct comedi_device *dev,
        /*  Allocate and Initialise Timer Subdevice Structures */
        s = &dev->subdevices[2];
        s->type = COMEDI_SUBD_TIMER;
-       s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+       s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 1;
        s->maxdata = 0;
        s->len_chanlist = 1;

diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index 55d00fd94c91cbdf507fa0489a6b8b30d085050e..d8410415cc90e5901771090df02f0dfddefb2881 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -163,7 +163,7 @@ static int apci1516_auto_attach(struct comedi_device *dev,
        s = &dev->subdevices[1];
        if (this_board->do_nchan) {
                s->type         = COMEDI_SUBD_DO;
-               s->subdev_flags = SDF_WRITEABLE;
+               s->subdev_flags = SDF_WRITABLE;
                s->n_chan       = this_board->do_nchan;
                s->maxdata      = 1;
                s->range_table  = &range_digital;

diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index c328230b85ec65e6be90d9e473d6c6a413d31d59..aa908a4a24cfd12a87ec1a890a8ebb9602cc2502 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -403,7 +403,7 @@ static int apci1564_auto_attach(struct comedi_device *dev,
        /*  Allocate and Initialise DO Subdevice Structures */
        s = &dev->subdevices[1];
        s->type         = COMEDI_SUBD_DO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 32;
        s->maxdata      = 1;
        s->range_table  = &range_digital;
@@ -431,7 +431,7 @@ static int apci1564_auto_attach(struct comedi_device *dev,
        /*  Allocate and Initialise Timer Subdevice Structures */
        s = &dev->subdevices[3];
        s->type         = COMEDI_SUBD_TIMER;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 3;
        s->maxdata      = 0;
        s->range_table  = &range_digital;

diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c b/drivers/staging/comedi/drivers/addi_apci_16xx.c
index 4162e2dc2860ec6495cac3e70462f182a2eabe96..a1248dab369f30f3e8ca63c6049fd0d9277c391c 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -140,7 +140,7 @@ static int apci16xx_auto_attach(struct comedi_device *dev,
        for (i = 0; i < n_subdevs; i++) {
                s = &dev->subdevices[i];
                s->type         = COMEDI_SUBD_DIO;
-               s->subdev_flags = SDF_WRITEABLE | SDF_READABLE;
+               s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
                s->n_chan       = ((i * 32) < board->n_chan) ? 32 : last;
                s->maxdata      = 1;
                s->range_table  = &range_digital;

diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c
index 7a5659fafbb37d021e6aadd9b973a43f48fc09a5..fb20c5ea90b8d5120b7a1cc9f02439a8648ed3d9 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -267,7 +267,7 @@ static int apci2032_auto_attach(struct comedi_device *dev,
        /* Initialize the digital output subdevice */
        s = &dev->subdevices[0];
        s->type         = COMEDI_SUBD_DO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 32;
        s->maxdata      = 1;
        s->range_table  = &range_digital;

diff --git a/drivers/staging/comedi/drivers/addi_apci_2200.c b/drivers/staging/comedi/drivers/addi_apci_2200.c
index 51ab1f937baec387dae046d7b4e5e9c18db376a3..1f9d13661ac902ca8c5435084c478a934f97b4d5 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -98,7 +98,7 @@ static int apci2200_auto_attach(struct comedi_device *dev,
        /* Initialize the digital output subdevice */
        s = &dev->subdevices[1];
        s->type         = COMEDI_SUBD_DO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 16;
        s->maxdata      = 1;
        s->range_table  = &range_digital;

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index e5dbbdf33b4091558191cbae7ee8d9ed15d6e324..e8da15cf4e2a137ba0fbd3f2f9105d8796963689 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -192,7 +192,7 @@ static int apci3120_auto_attach(struct comedi_device *dev,
        s = &dev->subdevices[1];
        if (this_board->has_ao) {
                s->type         = COMEDI_SUBD_AO;
-               s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+               s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
                s->n_chan       = 8;
                s->maxdata      = 0x3fff;
                s->range_table  = &range_bipolar10;
@@ -218,7 +218,7 @@ static int apci3120_auto_attach(struct comedi_device *dev,
        /* Digital Output subdevice */
        s = &dev->subdevices[3];
        s->type         = COMEDI_SUBD_DO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 4;
        s->maxdata      = 1;
        s->range_table  = &range_digital;
@@ -227,7 +227,7 @@ static int apci3120_auto_attach(struct comedi_device *dev,
        /* Timer subdevice */
        s = &dev->subdevices[4];
        s->type         = COMEDI_SUBD_TIMER;
-       s->subdev_flags = SDF_WRITEABLE | SDF_READABLE;
+       s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
        s->n_chan       = 1;
        s->maxdata      = 0x00ffffff;
        s->insn_write   = apci3120_write_insn_timer;

diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index 010efa3fed6caba7d2e1ad3553de2f20e2bd514c..992ac8ddbe643736597e987bfdac6bc50f4fad75 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -357,7 +357,7 @@ static int apci3501_auto_attach(struct comedi_device *dev,
        s = &dev->subdevices[0];
        if (ao_n_chan) {
                s->type         = COMEDI_SUBD_AO;
-               s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+               s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
                s->n_chan       = ao_n_chan;
                s->maxdata      = 0x3fff;
                s->range_table  = &apci3501_ao_range;
@@ -383,7 +383,7 @@ static int apci3501_auto_attach(struct comedi_device *dev,
        /* Initialize the digital output subdevice */
        s = &dev->subdevices[2];
        s->type         = COMEDI_SUBD_DO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 2;
        s->maxdata      = 1;
        s->range_table  = &range_digital;
@@ -392,7 +392,7 @@ static int apci3501_auto_attach(struct comedi_device *dev,
        /* Initialize the timer/watchdog subdevice */
        s = &dev->subdevices[3];
        s->type = COMEDI_SUBD_TIMER;
-       s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+       s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 1;
        s->maxdata = 0;
        s->len_chanlist = 1;

diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index db3ee9c429ada8325db7dda9666caacf736d8238..630d778df2c51dac8a478eb313e1bdadcff06b09 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -849,7 +849,7 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
        if (board->has_ao) {
                s = &dev->subdevices[subdev];
                s->type         = COMEDI_SUBD_AO;
-               s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+               s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
                s->n_chan       = 4;
                s->maxdata      = 0x0fff;
                s->range_table  = &apci3xxx_ao_range;
@@ -880,7 +880,7 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
        if (board->has_dig_out) {
                s = &dev->subdevices[subdev];
                s->type         = COMEDI_SUBD_DO;
-               s->subdev_flags = SDF_WRITEABLE;
+               s->subdev_flags = SDF_WRITABLE;
                s->n_chan       = 4;
                s->maxdata      = 1;
                s->range_table  = &range_digital;
@@ -893,7 +893,7 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
        if (board->has_ttl_io) {
                s = &dev->subdevices[subdev];
                s->type         = COMEDI_SUBD_DIO;
-               s->subdev_flags = SDF_READABLE | SDF_WRITEABLE;
+               s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
                s->n_chan       = 24;
                s->maxdata      = 1;
                s->io_bits      = 0xff; /* channels 0-7 are always outputs */

diff --git a/drivers/staging/comedi/drivers/addi_watchdog.c b/drivers/staging/comedi/drivers/addi_watchdog.c
index 23031feaa095ac7bd90d81b85fcf701c6f62202e..0af141ab39fcb9a89fc1dd8dd70b40c4f0a672d5 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_watchdog.c
+++ b/drivers/staging/comedi/drivers/addi_watchdog.c
@@ -134,7 +134,7 @@ int addi_watchdog_init(struct comedi_subdevice *s, unsigned long iobase)
        spriv->iobase = iobase;
 
        s->type         = COMEDI_SUBD_TIMER;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 1;
        s->maxdata      = 0xff;
        s->insn_config  = addi_watchdog_insn_config;

diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c
index 1610e2b406f3de779adb546248875f2d61dcd530..1b54716994c5d95603c3686d722c52388e276e9a 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -241,7 +241,7 @@ static int pci1723_auto_attach(struct comedi_device *dev,
        s = &dev->subdevices[0];
        dev->write_subdev = s;
        s->type         = COMEDI_SUBD_AO;
-       s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+       s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan       = 8;
        s->maxdata      = 0xffff;
        s->len_chanlist = 8;

diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c
index e03dd6e714155ecdfe6aa61e76d2aa857e556ae9..e7cb7032a910594aac53dbe44ff51c0095b49e25 100644 (file)
--- a/drivers/staging/comedi/drivers/c6xdigio.c
+++ b/drivers/staging/comedi/drivers/c6xdigio.c
@@ -265,7 +265,7 @@ static int c6xdigio_attach(struct comedi_device *dev,
        s = &dev->subdevices[0];
        /* pwm output subdevice */
        s->type         = COMEDI_SUBD_PWM;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 2;
        s->maxdata      = 500;
        s->range_table  = &range_unknown;

diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c
index 8c348bbf9e71b821656e5405fe293c56a2bee7d7..1b1399bcda5c144168a54784bb8b30a793383424 100644 (file)
--- a/drivers/staging/comedi/drivers/comedi_test.c
+++ b/drivers/staging/comedi/drivers/comedi_test.c
@@ -423,7 +423,7 @@ static int waveform_attach(struct comedi_device *dev,
        dev->write_subdev = s;
        /* analog output subdevice (loopback) */
        s->type = COMEDI_SUBD_AO;
-       s->subdev_flags = SDF_WRITEABLE | SDF_GROUND;
+       s->subdev_flags = SDF_WRITABLE | SDF_GROUND;
        s->n_chan = N_CHANS;
        s->maxdata = 0xffff;
        s->range_table = &waveform_ai_ranges;

diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c
index ab6e40608885c877e60241ca23debae2ff55ad69..f3909f3f755eff5a28d11607c279bf15c090ba94 100644 (file)
--- a/drivers/staging/comedi/drivers/das6402.c
+++ b/drivers/staging/comedi/drivers/das6402.c
@@ -497,7 +497,7 @@ static int das6402_attach(struct comedi_device *dev,
        /* Analog Output subdevice */
        s = &dev->subdevices[1];
        s->type         = COMEDI_SUBD_AO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 2;
        s->maxdata      = board->maxdata;
        s->range_table  = &das6402_ao_ranges;
@@ -520,7 +520,7 @@ static int das6402_attach(struct comedi_device *dev,
        /* Digital Input subdevice */
        s = &dev->subdevices[3];
        s->type         = COMEDI_SUBD_DO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 8;
        s->maxdata      = 1;
        s->range_table  = &range_digital;

diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c
index 77bb89fee3277938f570782575cd5c95b1f26b50..06c601d8fdff1d38fb275b0cadd9c2696b96061f 100644 (file)
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -804,7 +804,7 @@ static int dt9812_auto_attach(struct comedi_device *dev,
        /* Digital Output subdevice */
        s = &dev->subdevices[1];
        s->type         = COMEDI_SUBD_DO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 8;
        s->maxdata      = 1;
        s->range_table  = &range_digital;
@@ -822,7 +822,7 @@ static int dt9812_auto_attach(struct comedi_device *dev,
        /* Analog Output subdevice */
        s = &dev->subdevices[3];
        s->type         = COMEDI_SUBD_AO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 2;
        s->maxdata      = 0x0fff;
        s->range_table  = is_unipolar ? &range_unipolar2_5 : &range_bipolar10;

diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index 58a99e812818fab68aaba8b86f6c29d3aeba8837..0979f536ed39b49085e5be2344d794b58803f741 100644 (file)
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -689,7 +689,7 @@ static int gsc_hpdi_auto_attach(struct comedi_device *dev,
        s = &dev->subdevices[0];
        dev->read_subdev = s;
        s->type         = COMEDI_SUBD_DIO;
-       s->subdev_flags = SDF_READABLE | SDF_WRITEABLE | SDF_LSAMPL |
+       s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_LSAMPL |
                          SDF_CMD_READ;
        s->n_chan       = 32;
        s->len_chanlist = 32;

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 728447123b4c7763083b02747db053056c0757b7..ae6ac49e730efe77f7926f4cd64dcd98438d61cc 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -1421,7 +1421,7 @@ static int me4000_auto_attach(struct comedi_device *dev,
 
        if (thisboard->ao_nchan) {
                s->type = COMEDI_SUBD_AO;
-               s->subdev_flags = SDF_WRITEABLE | SDF_COMMON | SDF_GROUND;
+               s->subdev_flags = SDF_WRITABLE | SDF_COMMON | SDF_GROUND;
                s->n_chan = thisboard->ao_nchan;
                s->maxdata = 0xFFFF;    /*  16 bit DAC */
                s->range_table = &range_bipolar10;

diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 00eaaf8ac148ffe546c8c5d05ede056867627f2f..9dec9c175877e67ee510fc525199421c597bb2f9 100644 (file)
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -511,7 +511,7 @@ static int me_auto_attach(struct comedi_device *dev,
        s = &dev->subdevices[1];
        if (board->has_ao) {
                s->type         = COMEDI_SUBD_AO;
-               s->subdev_flags = SDF_WRITEABLE | SDF_COMMON;
+               s->subdev_flags = SDF_WRITABLE | SDF_COMMON;
                s->n_chan       = 4;
                s->maxdata      = 0x0fff;
                s->len_chanlist = 4;
@@ -528,7 +528,7 @@ static int me_auto_attach(struct comedi_device *dev,
 
        s = &dev->subdevices[2];
        s->type         = COMEDI_SUBD_DIO;
-       s->subdev_flags = SDF_READABLE | SDF_WRITEABLE;
+       s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
        s->n_chan       = 32;
        s->maxdata      = 1;
        s->len_chanlist = 32;

diff --git a/drivers/staging/comedi/drivers/ni_usb6501.c b/drivers/staging/comedi/drivers/ni_usb6501.c
index df7ada8611f413f80214031bf7c5c8c8f1d91bfc..3b5a1b90366d3eaf120fda6ed473e654acb5be65 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_usb6501.c
+++ b/drivers/staging/comedi/drivers/ni_usb6501.c
@@ -561,7 +561,7 @@ static int ni6501_auto_attach(struct comedi_device *dev,
        /* Counter subdevice */
        s = &dev->subdevices[1];
        s->type         = COMEDI_SUBD_COUNTER;
-       s->subdev_flags = SDF_READABLE | SDF_WRITEABLE | SDF_LSAMPL;
+       s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_LSAMPL;
        s->n_chan       = 1;
        s->maxdata      = 0xffffffff;
        s->insn_read    = ni6501_cnt_insn_read;

diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index f6c678eef8d5f3c331d04ab3c73d2ba52ba7bb82..0630df367494d01dde8f9151fb394404ea8e82f9 100644 (file)
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -734,7 +734,7 @@ static int daqp_auto_attach(struct comedi_device *dev,
 
        s = &dev->subdevices[1];
        s->type         = COMEDI_SUBD_AO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 2;
        s->maxdata      = 0x0fff;
        s->range_table  = &range_bipolar5;
@@ -754,7 +754,7 @@ static int daqp_auto_attach(struct comedi_device *dev,
 
        s = &dev->subdevices[3];
        s->type         = COMEDI_SUBD_DO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 1;
        s->maxdata      = 1;
        s->insn_bits    = daqp_do_insn_bits;

diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index 167f82418cb4c84aad41ea615e055977dc21e374..71226ee9064efc4c829a6b8804ac620df61551ac 100644 (file)
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -742,7 +742,7 @@ static int serial2002_attach(struct comedi_device *dev,
        /* digital output subdevice */
        s = &dev->subdevices[1];
        s->type         = COMEDI_SUBD_DO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 0;
        s->maxdata      = 1;
        s->range_table  = &range_digital;
@@ -760,7 +760,7 @@ static int serial2002_attach(struct comedi_device *dev,
        /* analog output subdevice */
        s = &dev->subdevices[3];
        s->type         = COMEDI_SUBD_AO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 0;
        s->maxdata      = 1;
        s->range_table  = NULL;

diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index 71003416edcfa645b673676af4f6da051ebc6948..a19a56ee0eef86bb0ab094b969564b3a0904bbc3 100644 (file)
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -797,7 +797,7 @@ static int vmk80xx_init_subdevices(struct comedi_device *dev)
        /* Analog output subdevice */
        s = &dev->subdevices[1];
        s->type         = COMEDI_SUBD_AO;
-       s->subdev_flags = SDF_WRITEABLE | SDF_GROUND;
+       s->subdev_flags = SDF_WRITABLE | SDF_GROUND;
        s->n_chan       = boardinfo->ao_nchans;
        s->maxdata      = 0x00ff;
        s->range_table  = boardinfo->range;
@@ -819,7 +819,7 @@ static int vmk80xx_init_subdevices(struct comedi_device *dev)
        /* Digital output subdevice */
        s = &dev->subdevices[3];
        s->type         = COMEDI_SUBD_DO;
-       s->subdev_flags = SDF_WRITEABLE;
+       s->subdev_flags = SDF_WRITABLE;
        s->n_chan       = 8;
        s->maxdata      = 1;
        s->range_table  = &range_digital;
@@ -834,7 +834,7 @@ static int vmk80xx_init_subdevices(struct comedi_device *dev)
        s->insn_read    = vmk80xx_cnt_insn_read;
        s->insn_config  = vmk80xx_cnt_insn_config;
        if (devpriv->model == VMK8055_MODEL) {
-               s->subdev_flags |= SDF_WRITEABLE;
+               s->subdev_flags |= SDF_WRITABLE;
                s->insn_write   = vmk80xx_cnt_insn_write;
        }
 
@@ -842,7 +842,7 @@ static int vmk80xx_init_subdevices(struct comedi_device *dev)
        if (devpriv->model == VMK8061_MODEL) {
                s = &dev->subdevices[5];
                s->type         = COMEDI_SUBD_PWM;
-               s->subdev_flags = SDF_READABLE | SDF_WRITEABLE;
+               s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
                s->n_chan       = boardinfo->pwm_nchans;
                s->maxdata      = boardinfo->pwm_maxdata;
                s->insn_read    = vmk80xx_pwm_insn_read;