Possible corrupt file or patch
I have a few files that look perfectly fine in nano and gedit but the patch file that gets made shows the columns out of alignment. I have remade them several times to the same effect. I have also made sure that there isnt a tab and space mix. Is this a bug that happens sometimes or do I need to do something to fix this? I would really appreciate any assistance on this or feed back that this file does the same for others. Signed-off-by: Walt Feasel --- v2 makes changes to correct for email format patch submission drivers/staging/speakup/speakup_decpc.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/speakup/speakup_decpc.c b/drivers/staging/speakup/speakup_decpc.c index 9e16498..813461c 100644 --- a/drivers/staging/speakup/speakup_decpc.c +++ b/drivers/staging/speakup/speakup_decpc.c @@ -75,12 +75,12 @@ #defineCTRL_buff_free 0x0800 /* buffer remain count */ #defineCTRL_buff_used 0x0900 /* buffer in use */ #defineCTRL_speech 0x0a00 /* immediate speech change */ -#define CTRL_SP_voice0x0001 /* voice change */ -#define CTRL_SP_rate 0x0002 /* rate change */ -#define CTRL_SP_comma0x0003 /* comma pause change */ -#define CTRL_SP_period 0x0004 /* period pause change */ -#define CTRL_SP_rate_delta 0x0005 /* delta rate change */ -#define CTRL_SP_get_param0x0006 /* return the desired parameter */ +#define CTRL_SP_voice 0x0001 /* voice change */ +#define CTRL_SP_rate 0x0002 /* rate change */ +#define CTRL_SP_comma 0x0003 /* comma pause change */ +#define CTRL_SP_period 0x0004 /* period pause change */ +#define CTRL_SP_rate_delta 0x0005 /* delta rate change */ +#define CTRL_SP_get_param 0x0006 /* return the desired parameter */ #defineCTRL_last_index 0x0b00 /* get last index spoken */ #defineCTRL_io_priority0x0c00 /* change i/o priority */ #defineCTRL_free_mem 0x0d00 /* get free paragraphs on module */ -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 3/3] staging: speakup: TODO Correct email
Walt Feasel writes: > Make email correction for k...@reisers.ca > > Signed-off-by: Walt Feasel Acked-by: Chris Brannon > --- > v2 makes changes to correct for email format patch submission > > drivers/staging/speakup/TODO | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/speakup/TODO b/drivers/staging/speakup/TODO > index 3094799..993410c 100644 > --- a/drivers/staging/speakup/TODO > +++ b/drivers/staging/speakup/TODO > @@ -42,6 +42,6 @@ We prefer that you contact us on the mailing list; however, > if you do > not want to subscribe to a mailing list, send your email to all of the > following: > > -w.d.hu...@gmail.com, ch...@the-brannons.com, k...@braille.uwo.ca and > +w.d.hu...@gmail.com, ch...@the-brannons.com, k...@reisers.ca and > samuel.thiba...@ens-lyon.org. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 0/3]: staging: speakup: refactor to make room for serial comms changes
Hello, Greg KH, on Sat 19 Nov 2016 17:08:09 +0100, wrote: > > Intention is to allow changing implementation of serial_out() for > > speakup_dummy while allowing other drivers to continue unaffected. > > Why is that needed? Why not post the whole series that implements what > you wish to have happen here? Just to explain: the rest of the series has not been implemented yet. Samuel ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 0/4] staging: speakup: refactor to make room for serial comms changes
Hello, Just looking over the patch, it looks good. I don't think it needs to be split in 4 pieces though, I'd say merge patches 1, 3, and 4 together, where patch 3 would be modified to make dummy use spk_serial_out too, to get a patch which does just one complete thing: make serial_out a method. Then you'll have other patches introducing spk_serial_out_tty and making some drivers use it. Also note that as Greg said, the patches you have just submitted do not really make sense alone. I don't know if staging people feel like applying them while it's only pavement for future work. If so, then good; otherwise, then fine too: it's good that you have sent them so that we could check how they look like, I just wanted to let you know that they might not get applied yet, just because one may want to see the future patches before applying what you have done so far. BTW, I have been looking at functions again, we'll also need a spk_synth_immediate_tty that drivers can use instead of spk_synth_immediate, in addition to the _in, and _out functions. For now (i.e. to make the dummy driver work, and probably a few simple more), the tty versions for _out and _synth_immediate will probably enough to get something working and commitable to the main kernel. Also, as mentioned, now the hard work is getting to open the tty from the kernel :) That'd be in a spk_tty_synth_probe function that drivers would use instead of spk_serial_synth_probe. Samuel ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 1/5] staging: speakup: synth.c Spaces around operators
Make suggested checkpatch modification for
CHECK: spaces preferred around that '|,+,-,/'
Signed-off-by: Walt Feasel
---
v3 fixes erroneous w added in v2
drivers/staging/speakup/synth.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
index 54b2f39..17aa440 100644
--- a/drivers/staging/speakup/synth.c
+++ b/drivers/staging/speakup/synth.c
@@ -303,11 +303,11 @@ void spk_get_index_count(int *linecount, int *sentcount)
sentence_count = ind % 10;
if ((ind / 10) <= synth->indexing.currindex)
- index_count = synth->indexing.currindex-(ind/10);
+ index_count = synth->indexing.currindex - (ind / 10);
else
index_count = synth->indexing.currindex
- -synth->indexing.lowindex
- + synth->indexing.highindex-(ind/10)+1;
+ - synth->indexing.lowindex
+ + synth->indexing.highindex - (ind / 10) + 1;
}
*sentcount = sentence_count;
@@ -476,10 +476,10 @@ void synth_remove(struct spk_synth *in_synth)
break;
}
for ( ; synths[i] != NULL; i++) /* compress table */
- synths[i] = synths[i+1];
+ synths[i] = synths[i + 1];
module_status = 0;
mutex_unlock(&spk_mutex);
}
EXPORT_SYMBOL_GPL(synth_remove);
-short spk_punc_masks[] = { 0, SOME, MOST, PUNC, PUNC|B_SYM };
+short spk_punc_masks[] = { 0, SOME, MOST, PUNC, PUNC | B_SYM };
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 1/5] staging: speakup: synth.c Spaces around operators
Hi Walt, [auto build test ERROR on staging/staging-testing] [also build test ERROR on v4.9-rc5 next-20161117] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Walt-Feasel/staging-speakup-synth-c-checkpatch-modifications/20161120-013925 config: openrisc-allmodconfig (attached as .config) compiler: or32-linux-gcc (GCC) 4.5.1-or32-1.0rc1 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=openrisc All errors (new ones prefixed by >>): drivers/staging/speakup/synth.c:1:1: error: stray '#' in program >> drivers/staging/speakup/synth.c:1:3: error: expected '=', ',', ';', 'asm' or >> '__attribute__' before 'include' In file included from drivers/staging/speakup/synth.c:2:0: include/linux/ctype.h: In function '__tolower': include/linux/ctype.h:43:6: error: '_ctype' undeclared (first use in this function) include/linux/ctype.h:43:6: note: each undeclared identifier is reported only once for each function it appears in include/linux/ctype.h: In function '__toupper': include/linux/ctype.h:50:6: error: '_ctype' undeclared (first use in this function) vim +1 drivers/staging/speakup/synth.c > 1 w#include 2 #include /* for isdigit() and friends */ 3 #include 4 #include/* for verify_area */ --- 0-DAY kernel test infrastructureOpen Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation .config.gz Description: application/gzip ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 4/4] staging: speakup: replace spk_serial_out() calls with serial_out()
This replaces calls to spk_serial_out() in spk_do_catch_up() and
spk_synth_flush()
with calls to serial_out(). spk_do_catch_up() and spk_synth_flush() are the only
functions through which speakup_dummy calls into spk_serial_out(). Calls to
spk_serial_out() in other drivers can stay for now.
Signed-off-by: Okash Khawaja
---
drivers/staging/speakup/synth.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
index 4f462c3..cef6591 100644
--- a/drivers/staging/speakup/synth.c
+++ b/drivers/staging/speakup/synth.c
@@ -118,7 +118,7 @@ void spk_do_catch_up(struct spk_synth *synth)
spin_unlock_irqrestore(&speakup_info.spinlock, flags);
if (ch == '\n')
ch = synth->procspeech;
- if (!spk_serial_out(ch)) {
+ if (!synth->serial_out(ch)) {
schedule_timeout(msecs_to_jiffies(full_time_val));
continue;
}
@@ -128,7 +128,7 @@ void spk_do_catch_up(struct spk_synth *synth)
delay_time_val = delay_time->u.n.value;
full_time_val = full_time->u.n.value;
spin_unlock_irqrestore(&speakup_info.spinlock, flags);
- if (spk_serial_out(synth->procspeech))
+ if (synth->serial_out(synth->procspeech))
schedule_timeout(
msecs_to_jiffies(delay_time_val));
else
@@ -141,7 +141,7 @@ void spk_do_catch_up(struct spk_synth *synth)
synth_buffer_getc();
spin_unlock_irqrestore(&speakup_info.spinlock, flags);
}
- spk_serial_out(synth->procspeech);
+ synth->serial_out(synth->procspeech);
}
EXPORT_SYMBOL_GPL(spk_do_catch_up);
@@ -164,7 +164,7 @@ EXPORT_SYMBOL_GPL(spk_synth_immediate);
void spk_synth_flush(struct spk_synth *synth)
{
- spk_serial_out(synth->clear);
+ synth->serial_out(synth->clear);
}
EXPORT_SYMBOL_GPL(spk_synth_flush);
--
2.10.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 3/4] staging: speakup: initialise serial_out() method in drivers
Initialise serial_out() to spk_serial_out() in all drivers except
speakup_dummy which uses spk_serial_out_tty() instead.
Signed-off-by: Okash Khawaja
---
drivers/staging/speakup/speakup_acntpc.c | 1 +
drivers/staging/speakup/speakup_acntsa.c | 1 +
drivers/staging/speakup/speakup_apollo.c | 1 +
drivers/staging/speakup/speakup_audptr.c | 1 +
drivers/staging/speakup/speakup_bns.c| 1 +
drivers/staging/speakup/speakup_decext.c | 1 +
drivers/staging/speakup/speakup_decpc.c | 1 +
drivers/staging/speakup/speakup_dectlk.c | 1 +
drivers/staging/speakup/speakup_dtlk.c | 1 +
drivers/staging/speakup/speakup_dummy.c | 1 +
drivers/staging/speakup/speakup_keypc.c | 1 +
drivers/staging/speakup/speakup_ltlk.c | 1 +
drivers/staging/speakup/speakup_soft.c | 1 +
drivers/staging/speakup/speakup_spkout.c | 1 +
drivers/staging/speakup/speakup_txprt.c | 1 +
15 files changed, 15 insertions(+)
diff --git a/drivers/staging/speakup/speakup_acntpc.c
b/drivers/staging/speakup/speakup_acntpc.c
index efb791b..22557e4 100644
--- a/drivers/staging/speakup/speakup_acntpc.c
+++ b/drivers/staging/speakup/speakup_acntpc.c
@@ -115,6 +115,7 @@ static struct spk_synth synth_acntpc = {
.vars = vars,
.probe = synth_probe,
.release = accent_release,
+ .serial_out = spk_serial_out,
.synth_immediate = synth_immediate,
.catch_up = do_catch_up,
.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_acntsa.c
b/drivers/staging/speakup/speakup_acntsa.c
index 34f45d3..3b18cb9 100644
--- a/drivers/staging/speakup/speakup_acntsa.c
+++ b/drivers/staging/speakup/speakup_acntsa.c
@@ -101,6 +101,7 @@ static struct spk_synth synth_acntsa = {
.vars = vars,
.probe = synth_probe,
.release = spk_serial_release,
+ .serial_out = spk_serial_out,
.synth_immediate = spk_synth_immediate,
.catch_up = spk_do_catch_up,
.flush = spk_synth_flush,
diff --git a/drivers/staging/speakup/speakup_apollo.c
b/drivers/staging/speakup/speakup_apollo.c
index 3cbc8a7..47db548 100644
--- a/drivers/staging/speakup/speakup_apollo.c
+++ b/drivers/staging/speakup/speakup_apollo.c
@@ -110,6 +110,7 @@ static struct spk_synth synth_apollo = {
.vars = vars,
.probe = spk_serial_synth_probe,
.release = spk_serial_release,
+ .serial_out = spk_serial_out,
.synth_immediate = spk_synth_immediate,
.catch_up = do_catch_up,
.flush = spk_synth_flush,
diff --git a/drivers/staging/speakup/speakup_audptr.c
b/drivers/staging/speakup/speakup_audptr.c
index 7a12b84..1714b7d 100644
--- a/drivers/staging/speakup/speakup_audptr.c
+++ b/drivers/staging/speakup/speakup_audptr.c
@@ -106,6 +106,7 @@ static struct spk_synth synth_audptr = {
.vars = vars,
.probe = synth_probe,
.release = spk_serial_release,
+ .serial_out = spk_serial_out,
.synth_immediate = spk_synth_immediate,
.catch_up = spk_do_catch_up,
.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_bns.c
b/drivers/staging/speakup/speakup_bns.c
index 570f0c2..e9cbcfc 100644
--- a/drivers/staging/speakup/speakup_bns.c
+++ b/drivers/staging/speakup/speakup_bns.c
@@ -98,6 +98,7 @@ static struct spk_synth synth_bns = {
.vars = vars,
.probe = spk_serial_synth_probe,
.release = spk_serial_release,
+ .serial_out = spk_serial_out,
.synth_immediate = spk_synth_immediate,
.catch_up = spk_do_catch_up,
.flush = spk_synth_flush,
diff --git a/drivers/staging/speakup/speakup_decext.c
b/drivers/staging/speakup/speakup_decext.c
index 1a5cf3d..098d079 100644
--- a/drivers/staging/speakup/speakup_decext.c
+++ b/drivers/staging/speakup/speakup_decext.c
@@ -129,6 +129,7 @@ static struct spk_synth synth_decext = {
.vars = vars,
.probe = spk_serial_synth_probe,
.release = spk_serial_release,
+ .serial_out = spk_serial_out,
.synth_immediate = spk_synth_immediate,
.catch_up = do_catch_up,
.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_decpc.c
b/drivers/staging/speakup/speakup_decpc.c
index d6479bd..7fc956a 100644
--- a/drivers/staging/speakup/speakup_decpc.c
+++ b/drivers/staging/speakup/speakup_decpc.c
@@ -222,6 +222,7 @@ static struct spk_synth synth_dec_pc = {
.vars = vars,
.probe = synth_probe,
.release = dtpc_release,
+ .serial_out = spk_serial_out,
.synth_immediate = synth_immediate,
.catch_up = do_catch_up,
.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_dectlk.c
b/drivers/staging/speakup/speakup_dectlk.c
index 7646567..9bdf2ea 100644
--- a/drivers/staging/speakup/speakup_dectlk.c
+++ b/drivers/staging/speakup/speakup_dectlk.c
@@ -132,6 +132,7 @@ static struct spk_synth synth_dectlk = {
.default_vol = g5_defaults,
.probe = spk_serial_synth_probe,
.release = spk_serial_release,
+
[PATCH v2 2/4] staging: speakup: add spk_serial_out_tty()
spk_serial_out_tty() simply delegates to spk_serial_out() for now.
Signed-off-by: Okash Khawaja
---
drivers/staging/speakup/serialio.c | 6 ++
drivers/staging/speakup/spk_priv.h | 1 +
2 files changed, 7 insertions(+)
diff --git a/drivers/staging/speakup/serialio.c
b/drivers/staging/speakup/serialio.c
index c2c435c..5110822 100644
--- a/drivers/staging/speakup/serialio.c
+++ b/drivers/staging/speakup/serialio.c
@@ -217,6 +217,12 @@ int spk_serial_out(const char ch)
}
EXPORT_SYMBOL_GPL(spk_serial_out);
+int spk_serial_out_tty(const char ch)
+{
+ return spk_serial_out(ch);
+}
+EXPORT_SYMBOL_GPL(spk_serial_out_tty);
+
void spk_serial_release(void)
{
if (speakup_info.port_tts == 0)
diff --git a/drivers/staging/speakup/spk_priv.h
b/drivers/staging/speakup/spk_priv.h
index 98c4b6f..bd85135 100644
--- a/drivers/staging/speakup/spk_priv.h
+++ b/drivers/staging/speakup/spk_priv.h
@@ -46,6 +46,7 @@ int spk_wait_for_xmitr(void);
unsigned char spk_serial_in(void);
unsigned char spk_serial_in_nowait(void);
int spk_serial_out(const char ch);
+int spk_serial_out_tty(const char ch);
void spk_serial_release(void);
char synth_buffer_getc(void);
--
2.10.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/4] staging: speakup: add serial_out() method to spk_synth
This adds serial_out() method to spk_synth struct.
Signed-off-by: Okash Khawaja
---
drivers/staging/speakup/spk_types.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/staging/speakup/spk_types.h
b/drivers/staging/speakup/spk_types.h
index e8ff5d7..56dc7df 100644
--- a/drivers/staging/speakup/spk_types.h
+++ b/drivers/staging/speakup/spk_types.h
@@ -168,6 +168,7 @@ struct spk_synth {
int *default_vol;
int (*probe)(struct spk_synth *synth);
void (*release)(void);
+ int (*serial_out)(const char ch);
const char *(*synth_immediate)(struct spk_synth *synth,
const char *buff);
void (*catch_up)(struct spk_synth *synth);
--
2.10.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/4] staging: speakup: refactor to make room for serial comms changes
Hi, This set of patches introduces serial_out() method which will point to spk_serial_out() for other drivers and spk_serial_out_tty() for speakup_dummy. Intention is to allow changing implementation of serial_out() for speakup_dummy while allowing other drivers to continue unaffected. spk_serial_out_tty() will use tty_struct instance instead of outb. Thanks, Okash ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 1/5] staging: speakup: synth.c Spaces around operators
Hi Walt, [auto build test ERROR on staging/staging-testing] [also build test ERROR on v4.9-rc5 next-20161117] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Walt-Feasel/staging-speakup-synth-c-checkpatch-modifications/20161120-013925 config: i386-randconfig-x006-201647 (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All error/warnings (new ones prefixed by >>): >> drivers/staging/speakup/synth.c:1:2: error: stray '#' in program w#include ^ >> drivers/staging/speakup/synth.c:1:1: error: unknown type name 'w' w#include ^ >> drivers/staging/speakup/synth.c:1:11: error: expected '=', ',', ';', 'asm' >> or '__attribute__' before '<' token w#include ^ In file included from drivers/staging/speakup/synth.c:2:0: include/linux/ctype.h: In function '__tolower': >> include/linux/ctype.h:20:22: error: '_ctype' undeclared (first use in this >> function) #define __ismask(x) (_ctype[(int)(unsigned char)(x)]) ^ >> include/linux/ctype.h:35:22: note: in expansion of macro '__ismask' #define isupper(c) ((__ismask(c)&(_U)) != 0) ^~~~ >> include/linux/ctype.h:43:6: note: in expansion of macro 'isupper' if (isupper(c)) ^~~ include/linux/ctype.h:20:22: note: each undeclared identifier is reported only once for each function it appears in #define __ismask(x) (_ctype[(int)(unsigned char)(x)]) ^ >> include/linux/ctype.h:35:22: note: in expansion of macro '__ismask' #define isupper(c) ((__ismask(c)&(_U)) != 0) ^~~~ >> include/linux/ctype.h:43:6: note: in expansion of macro 'isupper' if (isupper(c)) ^~~ include/linux/ctype.h: In function '__toupper': >> include/linux/ctype.h:20:22: error: '_ctype' undeclared (first use in this >> function) #define __ismask(x) (_ctype[(int)(unsigned char)(x)]) ^ include/linux/ctype.h:30:22: note: in expansion of macro '__ismask' #define islower(c) ((__ismask(c)&(_L)) != 0) ^~~~ >> include/linux/ctype.h:50:6: note: in expansion of macro 'islower' if (islower(c)) ^~~ vim +1 drivers/staging/speakup/synth.c > 1 w#include 2 #include /* for isdigit() and friends */ 3 #include 4 #include/* for verify_area */ --- 0-DAY kernel test infrastructureOpen Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation .config.gz Description: application/gzip ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/5] staging: speakup: synth.c Blank line before }
Make suggested checkpatch modification for CHECK: Blank lines aren't necessary before a close brace '}' Signed-off-by: Walt Feasel --- v2 makes changes to correct for email format patch submission drivers/staging/speakup/synth.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c index 9c73a33..9191a6d 100644 --- a/drivers/staging/speakup/synth.c +++ b/drivers/staging/speakup/synth.c @@ -308,7 +308,6 @@ void spk_get_index_count(int *linecount, int *sentcount) index_count = synth->indexing.currindex - synth->indexing.lowindex + synth->indexing.highindex - (ind / 10) + 1; - } *sentcount = sentence_count; *linecount = index_count; -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/5] staging: speakup: synth.c Spaces around operators
Make suggested checkpatch modification for
CHECK: spaces preferred around that '+,|,-,/'
Signed-off-by: Walt Feasel
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/synth.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
index 54b2f39..9c73a33 100644
--- a/drivers/staging/speakup/synth.c
+++ b/drivers/staging/speakup/synth.c
@@ -1,4 +1,4 @@
-#include
+w#include
#include/* for isdigit() and friends */
#include
#include /* for verify_area */
@@ -303,11 +303,11 @@ void spk_get_index_count(int *linecount, int *sentcount)
sentence_count = ind % 10;
if ((ind / 10) <= synth->indexing.currindex)
- index_count = synth->indexing.currindex-(ind/10);
+ index_count = synth->indexing.currindex - (ind / 10);
else
index_count = synth->indexing.currindex
- -synth->indexing.lowindex
- + synth->indexing.highindex-(ind/10)+1;
+ - synth->indexing.lowindex
+ + synth->indexing.highindex - (ind / 10) + 1;
}
*sentcount = sentence_count;
@@ -476,10 +476,10 @@ void synth_remove(struct spk_synth *in_synth)
break;
}
for ( ; synths[i] != NULL; i++) /* compress table */
- synths[i] = synths[i+1];
+ synths[i] = synths[i + 1];
module_status = 0;
mutex_unlock(&spk_mutex);
}
EXPORT_SYMBOL_GPL(synth_remove);
-short spk_punc_masks[] = { 0, SOME, MOST, PUNC, PUNC|B_SYM };
+short spk_punc_masks[] = { 0, SOME, MOST, PUNC, PUNC | B_SYM };
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/5] staging: speakup: synth.c checkpatch modifications
Make Linux kernel coding style modifications for XGI_main_26.c to include: Spaces around operators Blank lines before } Logical continuation Comment modifications Align on parenthesis Walt Feasel (5): staging: speakup: synth.c Spaces around operators staging: speakup: synth.c Blank line before } staging: speakup: synth.c Logical continuation staging: speakup: synth.c Comment modifications staging: speakup: synth.c Align parenthesis drivers/staging/speakup/synth.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 5/5] staging: speakup: synth.c Align parenthesis
Make suggested checkpatch modification for
CHECK: Alignment should match open parenthesis
Signed-off-by: Walt Feasel
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/synth.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
index 779b918..2821a2b2 100644
--- a/drivers/staging/speakup/synth.c
+++ b/drivers/staging/speakup/synth.c
@@ -67,7 +67,7 @@ int spk_serial_synth_probe(struct spk_synth *synth)
return -ENODEV;
}
pr_info("%s: ttyS%i, Driver Version %s\n",
- synth->long_name, synth->ser, synth->version);
+ synth->long_name, synth->ser, synth->version);
synth->alive = 1;
return 0;
}
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 3/5] staging: speakup: synth.c Logical continuation
Make suggested checkpatch modification for
CHECK: Logical continuations should be on the
previous line
Signed-off-by: Walt Feasel
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/synth.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
index 9191a6d..99d5cba 100644
--- a/drivers/staging/speakup/synth.c
+++ b/drivers/staging/speakup/synth.c
@@ -405,8 +405,8 @@ static int do_synth_init(struct spk_synth *in_synth)
speakup_register_var(var);
if (!spk_quiet_boot)
synth_printf("%s found\n", synth->long_name);
- if (synth->attributes.name
- && sysfs_create_group(speakup_kobj, &synth->attributes) < 0)
+ if (synth->attributes.name && sysfs_create_group(speakup_kobj,
+&synth->attributes) <
0)
return -ENOMEM;
synth_flags = synth->flags;
wake_up_interruptible_all(&speakup_event);
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 4/5] staging: speakup: synth.c Comment modifications
Make modifications to comment style Signed-off-by: Walt Feasel --- v2 makes changes to correct for email format patch submission drivers/staging/speakup/synth.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c index 99d5cba..779b918 100644 --- a/drivers/staging/speakup/synth.c +++ b/drivers/staging/speakup/synth.c @@ -8,7 +8,7 @@ w#include #include/* for loops_per_sec */ #include #include -#include /* for copy_from_user */ +#include /* for copy_from_user */ #include #include #include @@ -73,7 +73,8 @@ int spk_serial_synth_probe(struct spk_synth *synth) } EXPORT_SYMBOL_GPL(spk_serial_synth_probe); -/* Main loop of the progression thread: keep eating from the buffer +/* + * Main loop of the progression thread: keep eating from the buffer * and push to the serial port, waiting as needed * * For devices that have a "full" notification mechanism, the driver can -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/2] staging: speakup: thread.c align on parenthesis
Make suggested checkpatch modification for CHECK: Alignment should match open parenthesis Signed-off-by: Walt Feasel --- v2 makes changes to correct for email format patch submission drivers/staging/speakup/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/speakup/thread.c b/drivers/staging/speakup/thread.c index e4de7dc..8c64f1a 100644 --- a/drivers/staging/speakup/thread.c +++ b/drivers/staging/speakup/thread.c @@ -27,7 +27,7 @@ int speakup_thread(void *data) our_sound = spk_unprocessed_sound; spk_unprocessed_sound.active = 0; prepare_to_wait(&speakup_event, &wait, - TASK_INTERRUPTIBLE); + TASK_INTERRUPTIBLE); should_break = kthread_should_stop() || our_sound.active || (synth && synth->catch_up && synth->alive && -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/2] staging: speakup: thread.c Comment modifications
Make comment style modifications
Signed-off-by: Walt Feasel
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/thread.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/speakup/thread.c b/drivers/staging/speakup/thread.c
index 90c383e..e4de7dc 100644
--- a/drivers/staging/speakup/thread.c
+++ b/drivers/staging/speakup/thread.c
@@ -47,7 +47,8 @@ int speakup_thread(void *data)
if (our_sound.active)
kd_mksound(our_sound.freq, our_sound.jiffies);
if (synth && synth->catch_up && synth->alive) {
- /* It is up to the callee to take the lock, so that it
+ /*
+* It is up to the callee to take the lock, so that it
* can sleep whenever it likes
*/
synth->catch_up(synth);
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/2] staging: speakup: thread.c checkpatch modifications
Make Linux kernel style modifications for speakup to include comment style modifications align parenthesis Walt Feasel (2): staging: speakup: thread.c Comment modifications staging: speakup: thread.c align on parenthesis drivers/staging/speakup/thread.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: skein: threefish_block.c Remove blank lines
Make suggested checkpatch modification for CHECK: Please don't use multiple blank lines Signed-off-by: Walt Feasel --- v2 makes changes to correct for email format patch submission drivers/staging/skein/threefish_block.c | 16 1 file changed, 16 deletions(-) diff --git a/drivers/staging/skein/threefish_block.c b/drivers/staging/skein/threefish_block.c index a95563f..5064065 100644 --- a/drivers/staging/skein/threefish_block.c +++ b/drivers/staging/skein/threefish_block.c @@ -64,7 +64,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, b2 += b1; b1 = rol64(b1, 32) ^ b2; - b1 += k3 + t2; b0 += b1 + k2; b1 = rol64(b1, 14) ^ b0; @@ -117,7 +116,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, b2 += b1; b1 = rol64(b1, 32) ^ b2; - b1 += k0 + t1; b0 += b1 + k4; b1 = rol64(b1, 14) ^ b0; @@ -170,7 +168,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, b2 += b1; b1 = rol64(b1, 32) ^ b2; - b1 += k2 + t0; b0 += b1 + k1; b1 = rol64(b1, 14) ^ b0; @@ -223,7 +220,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, b2 += b1; b1 = rol64(b1, 32) ^ b2; - b1 += k4 + t2; b0 += b1 + k3; b1 = rol64(b1, 14) ^ b0; @@ -276,7 +272,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, b2 += b1; b1 = rol64(b1, 32) ^ b2; - b1 += k1 + t1; b0 += b1 + k0; b1 = rol64(b1, 14) ^ b0; @@ -329,7 +324,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, b2 += b1; b1 = rol64(b1, 32) ^ b2; - b1 += k3 + t0; b0 += b1 + k2; b1 = rol64(b1, 14) ^ b0; @@ -382,7 +376,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, b2 += b1; b1 = rol64(b1, 32) ^ b2; - b1 += k0 + t2; b0 += b1 + k4; b1 = rol64(b1, 14) ^ b0; @@ -435,7 +428,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, b2 += b1; b1 = rol64(b1, 32) ^ b2; - b1 += k2 + t1; b0 += b1 + k1; b1 = rol64(b1, 14) ^ b0; @@ -579,7 +571,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, b2 -= b3 + k3 + t2; b3 -= k4 + 16; - tmp = b3 ^ b0; b3 = ror64(tmp, 32); b0 -= b3; @@ -648,7 +639,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, b2 -= b3 + k1 + t0; b3 -= k2 + 14; - tmp = b3 ^ b0; b3 = ror64(tmp, 32); b0 -= b3; @@ -717,7 +707,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, b2 -= b3 + k4 + t1; b3 -= k0 + 12; - tmp = b3 ^ b0; b3 = ror64(tmp, 32); b0 -= b3; @@ -786,7 +775,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, b2 -= b3 + k2 + t2; b3 -= k3 + 10; - tmp = b3 ^ b0; b3 = ror64(tmp, 32); b0 -= b3; @@ -855,7 +843,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, b2 -= b3 + k0 + t0; b3 -= k1 + 8; - tmp = b3 ^ b0; b3 = ror64(tmp, 32); b0 -= b3; @@ -924,7 +911,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, b2 -= b3 + k3 + t1; b3 -= k4 + 6; - tmp = b3 ^ b0; b3 = ror64(tmp, 32); b0 -= b3; @@ -993,7 +979,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, b2 -= b3 + k1 + t2; b3 -= k2 + 4; - tmp = b3 ^ b0; b3 = ror64(tmp, 32); b0 -= b3; @@ -1062,7 +1047,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, b2 -= b3 + k4 + t0; b3 -= k0 + 2; - tmp = b3 ^ b0; b3 = ror64(tmp, 32); b0 -= b3; -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/3] staging: speakup: varhandlers.c Comment style modifications
Make modifications to comment style Signed-off-by: Walt Feasel --- v2 makes changes to correct for email format patch submission drivers/staging/speakup/varhandlers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/speakup/varhandlers.c b/drivers/staging/speakup/varhandlers.c index 21186e3..5ab7245 100644 --- a/drivers/staging/speakup/varhandlers.c +++ b/drivers/staging/speakup/varhandlers.c @@ -266,7 +266,8 @@ int spk_set_string_var(const char *page, struct st_var_header *var, int len) return 0; } -/* spk_set_mask_bits sets or clears the punc/delim/repeat bits, +/* + * spk_set_mask_bits sets or clears the punc/delim/repeat bits, * if input is null uses the defaults. * values for how: 0 clears bits of chars supplied, * 1 clears allk, 2 sets bits for chars -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/3] staging: speakup: checkpatch modifications
Make Linux kernel style modifications for speakup to include: Comment style modifications Align parenthesis Correct email in TODO Walt Feasel (3): staging: speakup: varhandlers.c Comment style modifications staging: speakup: varhandlers.c Align parenthesis staging: speakup: TODO Correct email drivers/staging/speakup/TODO | 2 +- drivers/staging/speakup/varhandlers.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 3/3] staging: speakup: TODO Correct email
Make email correction for k...@reisers.ca Signed-off-by: Walt Feasel --- v2 makes changes to correct for email format patch submission drivers/staging/speakup/TODO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/speakup/TODO b/drivers/staging/speakup/TODO index 3094799..993410c 100644 --- a/drivers/staging/speakup/TODO +++ b/drivers/staging/speakup/TODO @@ -42,6 +42,6 @@ We prefer that you contact us on the mailing list; however, if you do not want to subscribe to a mailing list, send your email to all of the following: -w.d.hu...@gmail.com, ch...@the-brannons.com, k...@braille.uwo.ca and +w.d.hu...@gmail.com, ch...@the-brannons.com, k...@reisers.ca and samuel.thiba...@ens-lyon.org. -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/3] staging: speakup: varhandlers.c Align parenthesis
Make suggested checkpatch modification for
CHECK: Alignment should match open parenthesis
Signed-off-by: Walt Feasel
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/varhandlers.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/speakup/varhandlers.c
b/drivers/staging/speakup/varhandlers.c
index 5ab7245..cc98419 100644
--- a/drivers/staging/speakup/varhandlers.c
+++ b/drivers/staging/speakup/varhandlers.c
@@ -237,8 +237,7 @@ int spk_set_num_var(int input, struct st_var_header *var,
int how)
if (!var_data->u.n.out_str)
l = sprintf(cp, var_data->u.n.synth_fmt, (int)val);
else
- l = sprintf(cp,
- var_data->u.n.synth_fmt, var_data->u.n.out_str[val]);
+ l = sprintf(cp, var_data->u.n.synth_fmt,
var_data->u.n.out_str[val]);
synth_printf("%s", cp);
return 0;
}
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/2] staging: dgnc: digi.h Spelling correction
Make spelling correction for 'regular'
Signed-off-by: Walt Feasel
---
v2 makes changes to correct for email format patch submission
drivers/staging/dgnc/digi.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/dgnc/digi.h b/drivers/staging/dgnc/digi.h
index 6b819e2..ec2e3dd 100644
--- a/drivers/staging/dgnc/digi.h
+++ b/drivers/staging/dgnc/digi.h
@@ -138,7 +138,7 @@ struct digi_getcounter {
#define DIGI_REALPORT_GETEVENTS (('e' << 8) | 111)
#define EV_OPU 0x0001 /* !http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/2] staging: dgnc: digi.h Comment style modifications
Make modifications to comment style
Signed-off-by: Walt Feasel
---
v2 makes changes to correct for email format patch submission
drivers/staging/dgnc/digi.h | 95 ++---
1 file changed, 47 insertions(+), 48 deletions(-)
diff --git a/drivers/staging/dgnc/digi.h b/drivers/staging/dgnc/digi.h
index 4e36573..6b819e2 100644
--- a/drivers/staging/dgnc/digi.h
+++ b/drivers/staging/dgnc/digi.h
@@ -17,16 +17,16 @@
#define __DIGI_H
#ifndef TIOCM_LE
-#defineTIOCM_LE0x01/* line enable
*/
-#defineTIOCM_DTR 0x02/* data terminal ready
*/
-#defineTIOCM_RTS 0x04/* request to send
*/
-#defineTIOCM_ST0x08/* secondary transmit
*/
-#defineTIOCM_SR0x10/* secondary receive
*/
-#defineTIOCM_CTS 0x20/* clear to send
*/
-#defineTIOCM_CAR 0x40/* carrier detect
*/
-#defineTIOCM_RNG 0x80/* ring indicator
*/
-#defineTIOCM_DSR 0x100 /* data set ready
*/
-#defineTIOCM_RITIOCM_RNG /* ring (alternate)
*/
+#defineTIOCM_LE0x01/* line enable */
+#defineTIOCM_DTR 0x02/* data terminal ready
*/
+#defineTIOCM_RTS 0x04/* request to send */
+#defineTIOCM_ST0x08/* secondary transmit */
+#defineTIOCM_SR0x10/* secondary receive */
+#defineTIOCM_CTS 0x20/* clear to send */
+#defineTIOCM_CAR 0x40/* carrier detect */
+#defineTIOCM_RNG 0x80/* ring indicator */
+#defineTIOCM_DSR 0x100 /* data set ready */
+#defineTIOCM_RITIOCM_RNG /* ring (alternate) */
#defineTIOCM_CDTIOCM_CAR /* carrier detect (alt)
*/
#endif
@@ -40,72 +40,71 @@
#defineTIOCMBIS(('d' << 8) | 255) /* set modem ctrl state
*/
#endif
-#define DIGI_GETA (('e' << 8) | 94) /* Read params */
-#define DIGI_SETA (('e' << 8) | 95) /* Set params */
-#define DIGI_SETAW (('e' << 8) | 96) /* Drain & set params */
+#define DIGI_GETA (('e' << 8) | 94) /* Read params */
+#define DIGI_SETA (('e' << 8) | 95) /* Set params */
+#define DIGI_SETAW (('e' << 8) | 96) /* Drain & set params */
#define DIGI_SETAF (('e' << 8) | 97) /* Drain, flush & set params */
#define DIGI_GET_NI_INFO (('d' << 8) | 250)/* Non-intelligent state info */
#define DIGI_LOOPBACK (('d' << 8) | 252) /*
* Enable/disable UART
* internal loopback
*/
-#define DIGI_FAST 0x0002 /* Fast baud rates */
-#define RTSPACE0x0004 /* RTS input flow control
*/
-#define CTSPACE0x0008 /* CTS output flow control
*/
+#define DIGI_FAST 0x0002 /* Fast baud rates */
+#define RTSPACE0x0004 /* RTS input flow control */
+#define CTSPACE0x0008 /* CTS output flow control */
#define DIGI_COOK 0x0080 /* Cooked processing done in FEP */
-#define DIGI_FORCEDCD 0x0100 /* Force carrier*/
-#defineDIGI_ALTPIN 0x0200 /* Alternate RJ-45 pin config
*/
+#define DIGI_FORCEDCD 0x0100 /* Force carrier */
+#defineDIGI_ALTPIN 0x0200 /* Alternate RJ-45 pin config */
#defineDIGI_PRINTER0x0800 /* Hold port open for flow
cntrl*/
-#define DIGI_DTR_TOGGLE0x2000 /* Support DTR Toggle
*/
-#define DIGI_RTS_TOGGLE0x8000 /* Support RTS Toggle
*/
-#define DIGI_PLEN 28 /* String length*/
-#defineDIGI_TSIZ 10 /* Terminal string len
*/
+#define DIGI_DTR_TOGGLE0x2000 /* Support DTR Toggle */
+#define DIGI_RTS_TOGGLE0x8000 /* Support RTS Toggle */
+#define DIGI_PLEN 28 /* String length */
+#defineDIGI_TSIZ 10 /* Terminal string len */
-/
+/*
* Structure used with ioctl commands for DIGI parameters.
- /
+ */
struct digi_t {
- unsigned short digi_flags; /* Flags (see above)*/
-
[PATCH v2 0/2] staging: dgnc: digi.h checkpatch modifications
Make Linux kernel coding style modificationsvfor digi.h to include: Comment style modifications Spelling correction Walt Feasel (2): staging: dgnc: digi.h Comment style modifications staging: dgnc: digi.h Spelling correction drivers/staging/dgnc/digi.h | 97 ++--- 1 file changed, 48 insertions(+), 49 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 1/4] staging: dgnc: dgnc_tty.c Space preferred around
Make suggested checkpatch modification for
CHECK: spaces preferred around that '|'
Signed-off-by: Walt Feasel
---
v3 makes changes to correct for email format patch submission
drivers/staging/dgnc/dgnc_tty.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c
index 8dc7c62..52be33f 100644
--- a/drivers/staging/dgnc/dgnc_tty.c
+++ b/drivers/staging/dgnc/dgnc_tty.c
@@ -2580,7 +2580,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty,
unsigned int cmd,
wake_up_interruptible(&ch->ch_tun.un_flags_wait);
}
- if (ch->ch_pun.un_flags & (UN_LOW|UN_EMPTY)) {
+ if (ch->ch_pun.un_flags & (UN_LOW | UN_EMPTY)) {
ch->ch_pun.un_flags &=
~(UN_LOW | UN_EMPTY);
wake_up_interruptible(&ch->ch_pun.un_flags_wait);
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 4/4] staging: dgnc: dgnc_tty.c Spelling corrections
Make spelling corrections for 'transitions' and 'satisfy' Signed-off-by: Walt Feasel --- v2 resubmitted without behaviour v3 makes changes to correct for email format patch submission drivers/staging/dgnc/dgnc_tty.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index 6a11ddf..6f3b0f6 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -2057,7 +2057,7 @@ static int dgnc_tty_digiseta(struct tty_struct *tty, spin_lock_irqsave(&ch->ch_lock, flags); - /* Handle transistions to and from RTS Toggle. */ + /* Handle transitions to and from RTS Toggle. */ if (!(ch->ch_digi.digi_flags & DIGI_RTS_TOGGLE) && (new_digi.digi_flags & DIGI_RTS_TOGGLE)) @@ -2066,7 +2066,7 @@ static int dgnc_tty_digiseta(struct tty_struct *tty, !(new_digi.digi_flags & DIGI_RTS_TOGGLE)) ch->ch_mostat |= (UART_MCR_RTS); - /* Handle transistions to and from DTR Toggle. */ + /* Handle transitions to and from DTR Toggle. */ if (!(ch->ch_digi.digi_flags & DIGI_DTR_TOGGLE) && (new_digi.digi_flags & DIGI_DTR_TOGGLE)) @@ -2654,7 +2654,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, * This ioctl allows insertion of a character into the front * of any pending data to be transmitted. * -* This ioctl is to satify the "Send Character Immediate" +* This ioctl is to satisfy the "Send Character Immediate" * call that the RealPort protocol spec requires. */ case DIGI_REALPORT_SENDIMMEDIATE: @@ -2674,7 +2674,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, /* * This ioctl returns all the current counts for the port. * -* This ioctl is to satify the "Line Error Counters" +* This ioctl is to satisfy the "Line Error Counters" * call that the RealPort protocol spec requires. */ case DIGI_REALPORT_GETCOUNTERS: @@ -2700,7 +2700,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, /* * This ioctl returns all current events. * -* This ioctl is to satify the "Event Reporting" +* This ioctl is to satisfy the "Event Reporting" * call that the RealPort protocol spec requires. */ case DIGI_REALPORT_GETEVENTS: -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 2/4] staging: dgnc: dgnc_tty.c Align on parenthesis
Make suggested checkpatch modification for CHECK: Alignment should match open parenthesis Signed-off-by: Walt Feasel --- v3 makes changes to correct for email format patch submission drivers/staging/dgnc/dgnc_tty.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index 52be33f..e4e596a 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -1003,9 +1003,8 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) * touched safely, the close routine will signal the * ch_flags_wait to wake us back up. */ - rc = wait_event_interruptible(ch->ch_flags_wait, - (((ch->ch_tun.un_flags | ch->ch_pun.un_flags) & - UN_CLOSING) == 0)); + rc = wait_event_interruptible(ch->ch_flags_wait, (((ch->ch_tun.un_flags | + ch->ch_pun.un_flags) & UN_CLOSING) == 0)); /* If ret is non-zero, user ctrl-c'ed us */ if (rc) @@ -1228,12 +1227,12 @@ static int dgnc_block_til_ready(struct tty_struct *tty, * from the current value. */ if (sleep_on_un_flags) - retval = wait_event_interruptible(un->un_flags_wait, - (old_flags != (ch->ch_tun.un_flags | - ch->ch_pun.un_flags))); + retval = wait_event_interruptible + (un->un_flags_wait, (old_flags != (ch->ch_tun.un_flags | + ch->ch_pun.un_flags))); else retval = wait_event_interruptible(ch->ch_flags_wait, - (old_flags != ch->ch_flags)); + (old_flags != ch->ch_flags)); /* * We got woken up for some reason. -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 3/4] staging: dgnc: dgnc_tty.c comment style modifications
Make modifications to comment style
Signed-off-by: Walt Feasel
---
v3 makes changes to correct for email format patch submission
drivers/staging/dgnc/dgnc_tty.c | 229 +++-
1 file changed, 86 insertions(+), 143 deletions(-)
diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c
index e4e596a..6a11ddf 100644
--- a/drivers/staging/dgnc/dgnc_tty.c
+++ b/drivers/staging/dgnc/dgnc_tty.c
@@ -13,13 +13,9 @@
* PURPOSE. See the GNU General Public License for more details.
*/
-/
- *
+/*
* This file implements the tty driver functionality for the
* Neo and ClassicBoard PCI based product lines.
- *
-
- *
*/
#include
@@ -42,19 +38,18 @@
#include "dgnc_sysfs.h"
#include "dgnc_utils.h"
-/*
- * Default transparent print information.
- */
+/* Default transparent print information. */
+
static const struct digi_t dgnc_digi_init = {
- .digi_flags = DIGI_COOK, /* Flags*/
- .digi_maxcps = 100,/* Max CPS */
- .digi_maxchar = 50, /* Max chars in print queue */
- .digi_bufsize = 100,/* Printer buffer size */
- .digi_onlen = 4, /* size of printer on string*/
- .digi_offlen = 4, /* size of printer off string */
- .digi_onstr = "\033[5i", /* ANSI printer on string ] */
- .digi_offstr = "\033[4i", /* ANSI printer off string ]*/
- .digi_term ="ansi" /* default terminal type*/
+ .digi_flags = DIGI_COOK, /* Flags */
+ .digi_maxcps = 100,/* Max CPS */
+ .digi_maxchar = 50, /* Max chars in print queue */
+ .digi_bufsize = 100,/* Printer buffer size */
+ .digi_onlen = 4, /* size of printer on string */
+ .digi_offlen = 4, /* size of printer off string */
+ .digi_onstr = "\033[5i", /* ANSI printer on string ] */
+ .digi_offstr = "\033[4i", /* ANSI printer off string ] */
+ .digi_term ="ansi" /* default terminal type */
};
/*
@@ -132,11 +127,7 @@ static const struct tty_operations dgnc_tty_ops = {
.send_xchar = dgnc_tty_send_xchar
};
-/
- *
- * TTY Initialization/Cleanup Functions
- *
- /
+/* TTY Initialization/Cleanup Functions */
/*
* dgnc_tty_register()
@@ -255,9 +246,7 @@ int dgnc_tty_init(struct dgnc_board *brd)
if (!brd)
return -ENXIO;
- /*
-* Initialize board structure elements.
-*/
+ /* Initialize board structure elements. */
vaddr = brd->re_map_membase;
@@ -396,9 +385,9 @@ static void dgnc_wmove(struct channel_t *ch, char *buf,
uint n)
}
if (n > 0) {
- /*
-* Move rest of data.
-*/
+
+ /* Move rest of data. */
+
remain = n;
memcpy(ch->ch_wqueue + head, buf, remain);
head += remain;
@@ -468,9 +457,8 @@ void dgnc_input(struct channel_t *ch)
goto exit_unlock;
}
- /*
-* If we are throttled, simply don't read any data.
-*/
+ /* If we are throttled, simply don't read any data. */
+
if (ch->ch_flags & CH_FORCED_STOPI)
goto exit_unlock;
@@ -583,10 +571,10 @@ void dgnc_input(struct channel_t *ch)
tty_ldisc_deref(ld);
}
-/
+/*
* Determines when CARRIER changes state and takes appropriate
* action.
- /
+ */
void dgnc_carrier(struct channel_t *ch)
{
int virt_carrier = 0;
@@ -604,9 +592,8 @@ void dgnc_carrier(struct channel_t *ch)
if (ch->ch_c_cflag & CLOCAL)
virt_carrier = 1;
- /*
-* Test for a VIRTUAL carrier transition to HIGH.
-*/
+ /* Test for a VIRTUAL carrier transition to HIGH. */
+
if (((ch->ch_flags & CH_FCAR) == 0) && (virt_carrier == 1)) {
/*
* When carrier rises, wake any threads waiting
@@ -617,9 +604,8 @@ void dgnc_carrier(struct channel_t *ch)
wake_up_interruptible(&ch->ch_flags_wait);
}
- /*
-* Test for a PHYSICAL carrier transition to HIGH.
-*/
+ /* Test for a PHYSICAL carrier transition to HIGH. */
+
if (((ch->ch_flags & CH_CD) == 0) && (phys_carrier == 1)) {
/*
* When carrier rises, wake any threads waiting
@@ -663,9 +649,8
[PATCH v3 0/4] staging: dgnc: dgnc_tty.c checkpatch modifications
Linux kernel coding style modifications for dgnc_tty.c to include: Space perferred around Align on parenthesis Comment style modifications Spelling corrections Walt Feasel (4): staging: dgnc: dgnc_tty.c Space preferred around staging: dgnc: dgnc_tty.c Align on parenthesis staging: dgnc: dgnc_tty.c comment style modifications staging: dgnc: dgnc_tty.c Spelling corrections drivers/staging/dgnc/dgnc_tty.c | 250 +++- 1 file changed, 96 insertions(+), 154 deletions(-) -- v2 resubmitted without behaviour v3 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/3] staging: speakup: add serial_out() method to spk_synth
On Sat, Nov 19, 2016 at 03:46:04PM +, Okash Khawaja wrote: > This does two things: > > 1. add serial_out() method to spk_synth > 2. replace calls to spk_serial_out() in spk_do_catch_up() and > spk_synth_flush() with calls to serial_out() > > spk_do_catch_up() and spk_synth_flush() are the only functions through > which speakup_dummy calls into spk_serial_out(). Calls to spk_serial_out() in > other drivers can stay for now. > > Signed-off-by: Okash Khawaja Doesn't this patch break all drivers that do not have this set? You can't break things with a patch, please rework this series (and rename the function), to not do that. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 0/3]: staging: speakup: refactor to make room for serial comms changes
On Sat, Nov 19, 2016 at 03:43:28PM +, Okash Khawaja wrote: > Hi, > > Following set of patches introduces serial_out() method which will point to > spk_serial_out() for other drivers and spk_serial_out2() for speakup_dummy. What does out2 do differently? That's a horrid name, please make it make sense. > Intention is to allow changing implementation of serial_out() for > speakup_dummy while allowing other drivers to continue unaffected. Why is that needed? Why not post the whole series that implements what you wish to have happen here? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/3] staging: speakup: add spk_serial_out2()
spk_serial_out2() simply delegates to spk_serial_out() for now.
Signed-off-by: Okash Khawaja
---
drivers/staging/speakup/serialio.c | 6 ++
drivers/staging/speakup/spk_priv.h | 1 +
2 files changed, 7 insertions(+)
diff --git a/drivers/staging/speakup/serialio.c
b/drivers/staging/speakup/serialio.c
index c2c435c..77592ef 100644
--- a/drivers/staging/speakup/serialio.c
+++ b/drivers/staging/speakup/serialio.c
@@ -217,6 +217,12 @@ int spk_serial_out(const char ch)
}
EXPORT_SYMBOL_GPL(spk_serial_out);
+int spk_serial_out2(const char ch)
+{
+ return spk_serial_out(ch);
+}
+EXPORT_SYMBOL_GPL(spk_serial_out2);
+
void spk_serial_release(void)
{
if (speakup_info.port_tts == 0)
diff --git a/drivers/staging/speakup/spk_priv.h
b/drivers/staging/speakup/spk_priv.h
index 98c4b6f..84480f3 100644
--- a/drivers/staging/speakup/spk_priv.h
+++ b/drivers/staging/speakup/spk_priv.h
@@ -46,6 +46,7 @@ int spk_wait_for_xmitr(void);
unsigned char spk_serial_in(void);
unsigned char spk_serial_in_nowait(void);
int spk_serial_out(const char ch);
+int spk_serial_out2(const char ch);
void spk_serial_release(void);
char synth_buffer_getc(void);
--
2.10.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/3] staging: speakup: initialise serial_out() method in drivers
Initialise serial_out() to spk_serial_out() in all drivers except
speakup_dummy which uses spk_serial_out2() instead.
Signed-off-by: Okash Khawaja
---
drivers/staging/speakup/speakup_acntpc.c | 1 +
drivers/staging/speakup/speakup_acntsa.c | 1 +
drivers/staging/speakup/speakup_apollo.c | 1 +
drivers/staging/speakup/speakup_audptr.c | 1 +
drivers/staging/speakup/speakup_bns.c| 1 +
drivers/staging/speakup/speakup_decext.c | 1 +
drivers/staging/speakup/speakup_decpc.c | 1 +
drivers/staging/speakup/speakup_dectlk.c | 1 +
drivers/staging/speakup/speakup_dtlk.c | 1 +
drivers/staging/speakup/speakup_dummy.c | 1 +
drivers/staging/speakup/speakup_keypc.c | 1 +
drivers/staging/speakup/speakup_ltlk.c | 1 +
drivers/staging/speakup/speakup_soft.c | 1 +
drivers/staging/speakup/speakup_spkout.c | 1 +
drivers/staging/speakup/speakup_txprt.c | 1 +
15 files changed, 15 insertions(+)
diff --git a/drivers/staging/speakup/speakup_acntpc.c
b/drivers/staging/speakup/speakup_acntpc.c
index efb791b..22557e4 100644
--- a/drivers/staging/speakup/speakup_acntpc.c
+++ b/drivers/staging/speakup/speakup_acntpc.c
@@ -115,6 +115,7 @@ static struct spk_synth synth_acntpc = {
.vars = vars,
.probe = synth_probe,
.release = accent_release,
+ .serial_out = spk_serial_out,
.synth_immediate = synth_immediate,
.catch_up = do_catch_up,
.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_acntsa.c
b/drivers/staging/speakup/speakup_acntsa.c
index 34f45d3..3b18cb9 100644
--- a/drivers/staging/speakup/speakup_acntsa.c
+++ b/drivers/staging/speakup/speakup_acntsa.c
@@ -101,6 +101,7 @@ static struct spk_synth synth_acntsa = {
.vars = vars,
.probe = synth_probe,
.release = spk_serial_release,
+ .serial_out = spk_serial_out,
.synth_immediate = spk_synth_immediate,
.catch_up = spk_do_catch_up,
.flush = spk_synth_flush,
diff --git a/drivers/staging/speakup/speakup_apollo.c
b/drivers/staging/speakup/speakup_apollo.c
index 3cbc8a7..47db548 100644
--- a/drivers/staging/speakup/speakup_apollo.c
+++ b/drivers/staging/speakup/speakup_apollo.c
@@ -110,6 +110,7 @@ static struct spk_synth synth_apollo = {
.vars = vars,
.probe = spk_serial_synth_probe,
.release = spk_serial_release,
+ .serial_out = spk_serial_out,
.synth_immediate = spk_synth_immediate,
.catch_up = do_catch_up,
.flush = spk_synth_flush,
diff --git a/drivers/staging/speakup/speakup_audptr.c
b/drivers/staging/speakup/speakup_audptr.c
index 7a12b84..1714b7d 100644
--- a/drivers/staging/speakup/speakup_audptr.c
+++ b/drivers/staging/speakup/speakup_audptr.c
@@ -106,6 +106,7 @@ static struct spk_synth synth_audptr = {
.vars = vars,
.probe = synth_probe,
.release = spk_serial_release,
+ .serial_out = spk_serial_out,
.synth_immediate = spk_synth_immediate,
.catch_up = spk_do_catch_up,
.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_bns.c
b/drivers/staging/speakup/speakup_bns.c
index 570f0c2..e9cbcfc 100644
--- a/drivers/staging/speakup/speakup_bns.c
+++ b/drivers/staging/speakup/speakup_bns.c
@@ -98,6 +98,7 @@ static struct spk_synth synth_bns = {
.vars = vars,
.probe = spk_serial_synth_probe,
.release = spk_serial_release,
+ .serial_out = spk_serial_out,
.synth_immediate = spk_synth_immediate,
.catch_up = spk_do_catch_up,
.flush = spk_synth_flush,
diff --git a/drivers/staging/speakup/speakup_decext.c
b/drivers/staging/speakup/speakup_decext.c
index 1a5cf3d..098d079 100644
--- a/drivers/staging/speakup/speakup_decext.c
+++ b/drivers/staging/speakup/speakup_decext.c
@@ -129,6 +129,7 @@ static struct spk_synth synth_decext = {
.vars = vars,
.probe = spk_serial_synth_probe,
.release = spk_serial_release,
+ .serial_out = spk_serial_out,
.synth_immediate = spk_synth_immediate,
.catch_up = do_catch_up,
.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_decpc.c
b/drivers/staging/speakup/speakup_decpc.c
index d6479bd..7fc956a 100644
--- a/drivers/staging/speakup/speakup_decpc.c
+++ b/drivers/staging/speakup/speakup_decpc.c
@@ -222,6 +222,7 @@ static struct spk_synth synth_dec_pc = {
.vars = vars,
.probe = synth_probe,
.release = dtpc_release,
+ .serial_out = spk_serial_out,
.synth_immediate = synth_immediate,
.catch_up = do_catch_up,
.flush = synth_flush,
diff --git a/drivers/staging/speakup/speakup_dectlk.c
b/drivers/staging/speakup/speakup_dectlk.c
index 7646567..9bdf2ea 100644
--- a/drivers/staging/speakup/speakup_dectlk.c
+++ b/drivers/staging/speakup/speakup_dectlk.c
@@ -132,6 +132,7 @@ static struct spk_synth synth_dectlk = {
.default_vol = g5_defaults,
.probe = spk_serial_synth_probe,
.release = spk_serial_release,
+ .se
[PATCH 1/3] staging: speakup: add serial_out() method to spk_synth
This does two things:
1. add serial_out() method to spk_synth
2. replace calls to spk_serial_out() in spk_do_catch_up() and
spk_synth_flush() with calls to serial_out()
spk_do_catch_up() and spk_synth_flush() are the only functions through
which speakup_dummy calls into spk_serial_out(). Calls to spk_serial_out() in
other drivers can stay for now.
Signed-off-by: Okash Khawaja
---
drivers/staging/speakup/spk_types.h | 1 +
drivers/staging/speakup/synth.c | 8
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/speakup/spk_types.h
b/drivers/staging/speakup/spk_types.h
index e8ff5d7..56dc7df 100644
--- a/drivers/staging/speakup/spk_types.h
+++ b/drivers/staging/speakup/spk_types.h
@@ -168,6 +168,7 @@ struct spk_synth {
int *default_vol;
int (*probe)(struct spk_synth *synth);
void (*release)(void);
+ int (*serial_out)(const char ch);
const char *(*synth_immediate)(struct spk_synth *synth,
const char *buff);
void (*catch_up)(struct spk_synth *synth);
diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
index 4f462c3..cef6591 100644
--- a/drivers/staging/speakup/synth.c
+++ b/drivers/staging/speakup/synth.c
@@ -118,7 +118,7 @@ void spk_do_catch_up(struct spk_synth *synth)
spin_unlock_irqrestore(&speakup_info.spinlock, flags);
if (ch == '\n')
ch = synth->procspeech;
- if (!spk_serial_out(ch)) {
+ if (!synth->serial_out(ch)) {
schedule_timeout(msecs_to_jiffies(full_time_val));
continue;
}
@@ -128,7 +128,7 @@ void spk_do_catch_up(struct spk_synth *synth)
delay_time_val = delay_time->u.n.value;
full_time_val = full_time->u.n.value;
spin_unlock_irqrestore(&speakup_info.spinlock, flags);
- if (spk_serial_out(synth->procspeech))
+ if (synth->serial_out(synth->procspeech))
schedule_timeout(
msecs_to_jiffies(delay_time_val));
else
@@ -141,7 +141,7 @@ void spk_do_catch_up(struct spk_synth *synth)
synth_buffer_getc();
spin_unlock_irqrestore(&speakup_info.spinlock, flags);
}
- spk_serial_out(synth->procspeech);
+ synth->serial_out(synth->procspeech);
}
EXPORT_SYMBOL_GPL(spk_do_catch_up);
@@ -164,7 +164,7 @@ EXPORT_SYMBOL_GPL(spk_synth_immediate);
void spk_synth_flush(struct spk_synth *synth)
{
- spk_serial_out(synth->clear);
+ synth->serial_out(synth->clear);
}
EXPORT_SYMBOL_GPL(spk_synth_flush);
--
2.10.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/3]: staging: speakup: refactor to make room for serial comms changes
Hi, Following set of patches introduces serial_out() method which will point to spk_serial_out() for other drivers and spk_serial_out2() for speakup_dummy. Intention is to allow changing implementation of serial_out() for speakup_dummy while allowing other drivers to continue unaffected. Thanks, Okash ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v4] staging: slicoss: fix different address space warnings
On Fri, Nov 18, 2016 at 06:57:18PM +0100, Sergio Paracuellos wrote:
> Remove incorrect __iomem annotation.
>
> This patch fix the following sparse warnings in slicoss driver:
> warning: incorrect type in assignment (different address spaces)
>
> Signed-off-by: Sergio Paracuellos
> ---
> drivers/staging/slicoss/slic.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/slicoss/slic.h b/drivers/staging/slicoss/slic.h
> index 420546d..14d7555 100644
> --- a/drivers/staging/slicoss/slic.h
> +++ b/drivers/staging/slicoss/slic.h
> @@ -380,7 +380,7 @@ struct slic_shmemory {
> dma_addr_t isr_phaddr;
> dma_addr_t lnkstatus_phaddr;
> dma_addr_t stats_phaddr;
> - struct slic_shmem_data __iomem *shmem_data;
> + struct slic_shmem_data *shmem_data;
But, is this the correct fix? It looks like shmem_data is being treated
like a pointer to io memory, so we need to use the correct accessors for
that memory, and not just a "raw" pointer, right? Removing this marking
seems to be moving backwards...
thanks,
greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: iio: ad9832:
On Sat, Nov 19, 2016 at 12:08:34PM +0100, Christophe JAILLET wrote:
> Commit a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator") and
> commit 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'") add
> some dereference of 'st' which is an un-initialized pointer at this point.
>
> Re-order code and tweak error handling in order to allocate memory and have
> 'st' be a valid pointer before using it.
Hello,
Thanks for the patch but this fix was already submitted and applied:
https://git.kernel.org/cgit/linux/kernel/git/jic23/iio.git/commit/?h=testing&id=6826fdbd2e207f8107e65c5a372ac616e7af11b4
Eva
>
> Fixes: a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator")
> Fixes: 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'")
>
> Signed-off-by: Christophe JAILLET
> ---
> Compile tested only
> ---
> drivers/staging/iio/frequency/ad9832.c | 19 +--
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/iio/frequency/ad9832.c
> b/drivers/staging/iio/frequency/ad9832.c
> index 639047fade30..16894836f982 100644
> --- a/drivers/staging/iio/frequency/ad9832.c
> +++ b/drivers/staging/iio/frequency/ad9832.c
> @@ -211,6 +211,15 @@ static int ad9832_probe(struct spi_device *spi)
> return -ENODEV;
> }
>
> + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
> + if (!indio_dev)
> + return -ENOMEM;
> +
> + spi_set_drvdata(spi, indio_dev);
> + st = iio_priv(indio_dev);
> + st->mclk = pdata->mclk;
> + st->spi = spi;
> +
> st->avdd = devm_regulator_get(&spi->dev, "avdd");
> if (IS_ERR(st->avdd))
> return PTR_ERR(st->avdd);
> @@ -233,16 +242,6 @@ static int ad9832_probe(struct spi_device *spi)
> goto error_disable_avdd;
> }
>
> - indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
> - if (!indio_dev) {
> - ret = -ENOMEM;
> - goto error_disable_dvdd;
> - }
> - spi_set_drvdata(spi, indio_dev);
> - st = iio_priv(indio_dev);
> - st->mclk = pdata->mclk;
> - st->spi = spi;
> -
> indio_dev->dev.parent = &spi->dev;
> indio_dev->name = spi_get_device_id(spi)->name;
> indio_dev->info = &ad9832_info;
> --
> 2.9.3
>
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: iio: ad9832:
On 19/11/16 11:08, Christophe JAILLET wrote:
> Commit a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator") and
> commit 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'") add
> some dereference of 'st' which is an un-initialized pointer at this point.
>
> Re-order code and tweak error handling in order to allocate memory and have
> 'st' be a valid pointer before using it.
>
> Fixes: a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator")
> Fixes: 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'")
>
> Signed-off-by: Christophe JAILLET
Thanks but fixed already.
6826fdbd2 "staging: iio: ad9832: allocate data before using
Arnd Bergmann
Jonathan
> ---
> Compile tested only
> ---
> drivers/staging/iio/frequency/ad9832.c | 19 +--
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/iio/frequency/ad9832.c
> b/drivers/staging/iio/frequency/ad9832.c
> index 639047fade30..16894836f982 100644
> --- a/drivers/staging/iio/frequency/ad9832.c
> +++ b/drivers/staging/iio/frequency/ad9832.c
> @@ -211,6 +211,15 @@ static int ad9832_probe(struct spi_device *spi)
> return -ENODEV;
> }
>
> + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
> + if (!indio_dev)
> + return -ENOMEM;
> +
> + spi_set_drvdata(spi, indio_dev);
> + st = iio_priv(indio_dev);
> + st->mclk = pdata->mclk;
> + st->spi = spi;
> +
> st->avdd = devm_regulator_get(&spi->dev, "avdd");
> if (IS_ERR(st->avdd))
> return PTR_ERR(st->avdd);
> @@ -233,16 +242,6 @@ static int ad9832_probe(struct spi_device *spi)
> goto error_disable_avdd;
> }
>
> - indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
> - if (!indio_dev) {
> - ret = -ENOMEM;
> - goto error_disable_dvdd;
> - }
> - spi_set_drvdata(spi, indio_dev);
> - st = iio_priv(indio_dev);
> - st->mclk = pdata->mclk;
> - st->spi = spi;
> -
> indio_dev->dev.parent = &spi->dev;
> indio_dev->name = spi_get_device_id(spi)->name;
> indio_dev->info = &ad9832_info;
>
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: iio: ad9832:
Commit a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator") and
commit 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'") add
some dereference of 'st' which is an un-initialized pointer at this point.
Re-order code and tweak error handling in order to allocate memory and have
'st' be a valid pointer before using it.
Fixes: a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator")
Fixes: 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'")
Signed-off-by: Christophe JAILLET
---
Compile tested only
---
drivers/staging/iio/frequency/ad9832.c | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/iio/frequency/ad9832.c
b/drivers/staging/iio/frequency/ad9832.c
index 639047fade30..16894836f982 100644
--- a/drivers/staging/iio/frequency/ad9832.c
+++ b/drivers/staging/iio/frequency/ad9832.c
@@ -211,6 +211,15 @@ static int ad9832_probe(struct spi_device *spi)
return -ENODEV;
}
+ indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+ if (!indio_dev)
+ return -ENOMEM;
+
+ spi_set_drvdata(spi, indio_dev);
+ st = iio_priv(indio_dev);
+ st->mclk = pdata->mclk;
+ st->spi = spi;
+
st->avdd = devm_regulator_get(&spi->dev, "avdd");
if (IS_ERR(st->avdd))
return PTR_ERR(st->avdd);
@@ -233,16 +242,6 @@ static int ad9832_probe(struct spi_device *spi)
goto error_disable_avdd;
}
- indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
- if (!indio_dev) {
- ret = -ENOMEM;
- goto error_disable_dvdd;
- }
- spi_set_drvdata(spi, indio_dev);
- st = iio_priv(indio_dev);
- st->mclk = pdata->mclk;
- st->spi = spi;
-
indio_dev->dev.parent = &spi->dev;
indio_dev->name = spi_get_device_id(spi)->name;
indio_dev->info = &ad9832_info;
--
2.9.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
