Re: [PATCH] x86/signals: Fix save/restore signal stack to correctly support sigset_t
Got it. Thanks again Al. On Sat, Nov 28, 2020 at 7:28 PM Al Viro wrote: > > On Sat, Nov 28, 2020 at 06:19:31PM -0800, Walt Drummond wrote: > > Thanks Al. I want to understand the nuance, so please bear with me as I > > reason this out. The cast in stone nature of this is due to both the need > > to keep userspace and kernel space in sync (ie, you'd have to coordinate > > libc and kernel changes super tightly to pull this off), and any change in > > the size of struct rt_sigframe would break backwards compatibility with > > older binaries, is that correct? > > Pretty much so. I would expect gdb and friends to be very unhappy about > that, for starters, along with a bunch of fun stuff like JVM, etc. > > Ask the userland folks (libc, gdb, etc.) how would they feel about such > changes. I'm fairly sure that it's _not_ going to be a matter of > changing _NSIG, rebuilding the kernel and living happily ever after.
Re: [PATCH] x86/signals: Fix save/restore signal stack to correctly support sigset_t
(Sorry, resending as Gmail decided to ignore "Plaintext mode") Thanks Al. I want to understand the nuance, so please bear with me as I reason this out. The cast in stone nature of this is due to both the need to keep userspace and kernel space in sync (ie, you'd have to coordinate libc and kernel changes super tightly to pull this off), and any change in the size of struct rt_sigframe would break backwards compatibility with older binaries, is that correct? Thanks, appreciate the help here. --Walt On Sat, Nov 28, 2020 at 6:19 PM Walt Drummond wrote: > > Thanks Al. I want to understand the nuance, so please bear with me as I > reason this out. The cast in stone nature of this is due to both the need > to keep userspace and kernel space in sync (ie, you'd have to coordinate libc > and kernel changes super tightly to pull this off), and any change in the > size of struct rt_sigframe would break backwards compatibility with older > binaries, is that correct? > > Thanks, appreciate the help here. > --Walt > > > On Fri, Nov 27, 2020 at 9:23 PM Al Viro wrote: >> >> On Thu, Nov 19, 2020 at 02:11:33PM -0800, Walt Drummond wrote: >> > The macro unsafe_put_sigmask() only handles the first 64 bits of the >> > sigmask_t, which works today. However, if the definition of the >> > sigset_t structure ever changed, >> >> ... existing userland would get fucked over, since sigset_t is >> present in user-visible data structures. Including the ones >> we are using that thing for - struct rt_sigframe, for starters. >> >> Layout of those suckers is very much cast in stone. We *can't* >> change it, no matter what we do kernel-side. >> >> NAKed-by: Al Viro
[PATCH] x86/signals: Fix save/restore signal stack to correctly support sigset_t
The macro unsafe_put_sigmask() only handles the first 64 bits of the
sigmask_t, which works today. However, if the definition of the
sigset_t structure ever changed, this would fail to setup/restore the
signal stack properly and likely corrupt the sigset. This patch
updates unsafe_put_sigmask() to correctly save all the fields in the
sigmask_t struct, and adds unsafe_put_compat_sigmask() to handle the
compat_sigset_t cases.
Signed-off-by: Walt Drummond
---
arch/x86/kernel/signal.c | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index be0d7d4152ec..4d5134b4bb5f 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -203,11 +203,18 @@ do {
\
goto label; \
} while(0);
-#define unsafe_put_sigmask(set, frame, label) \
+#define unsafe_put_compat_sigmask(set, frame, label) \
unsafe_put_user(*(__u64 *)(set), \
(__u64 __user *)&(frame)->uc.uc_sigmask, \
label)
+#define unsafe_put_sigmask(set, frame, label) \
+do {\
+ int i; \
+ for (i = 0; i < _NSIG_WORDS; i++) \
+ unsafe_put_user((set)->sig[i], &(frame)->uc.uc_sigmask.sig[i],
label); \
+} while(0);
+
/*
* Set up a signal frame.
*/
@@ -566,7 +573,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig,
restorer = ksig->ka.sa.sa_restorer;
unsafe_put_user(restorer, (unsigned long __user *)>pretcode,
Efault);
unsafe_put_sigcontext(>uc.uc_mcontext, fp, regs, set, Efault);
- unsafe_put_sigmask(set, frame, Efault);
+ unsafe_put_compat_sigmask(set, frame, Efault);
user_access_end();
if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
@@ -643,7 +650,7 @@ SYSCALL_DEFINE0(rt_sigreturn)
frame = (struct rt_sigframe __user *)(regs->sp - sizeof(long));
if (!access_ok(frame, sizeof(*frame)))
goto badframe;
- if (__get_user(*(__u64 *), (__u64 __user *)>uc.uc_sigmask))
+ if (copy_from_user(, >uc.uc_sigmask, sizeof(sigset_t)))
goto badframe;
if (__get_user(uc_flags, >uc.uc_flags))
goto badframe;
--
2.27.0
Re: [HELP REQUESTED from the community] Was: Staging status of speakup
Hi, I have added a few things inline in Greg's message, mainly regarding the bleeps and cursor_time. FWIW, Willem On Wed, 24 Jul 2019, Gregory Nowak wrote: [The e-mail server of the sender could not be verified (SPF Record)] On Fri, Jul 12, 2019 at 05:46:23PM -0700, Gregory Nowak wrote: On Fri, Jul 12, 2019 at 11:23:19AM +0200, Samuel Thibault wrote: Hello, To readers of the linux-speakup: could you help on this so we can get Speakup in mainline? Neither Okash or I completely know what user consequences the files in /sys/accessibility/speakup/ have, so could people give brief explanations for each file (something like 3-6 lines of explanation)? I have a recollection of documenting most of this on the speakup list in response to a similar query a number of years ago. Unfortunately, the speakup mailing list archives aren't easily searchable, and I don't have a local copy of that mail. Kirk, doing grep with a few of the file names in /sys/accessibility/speakup against the list's mbox file archive should find that message if it's in fact there. If you can please find it, and post the date when it was sent, we can provide a URL to that thread as a starting point. If my recollection is wrong, and such a message isn't in the archives, I'll write up what I know about. I've located the message I was thinking of in the archives, but that describes some speakup key commands, not /sys/accessibility/speakup. So, here's what I know, and hopefully someone else can fill in the rest. attrib_bleep Beeps the PC speaker when there is an attribute change such as foreground or background color when using speakup review commands. One = on, zero = off. I'm not currently at a machine with a working PC speaker, so can't test this right now. bell_pos As far as I know, this works much like a typewriter bell. If for example 72 is echoed to bell_pos, it will beep the PC speaker when typing on a line past character 72. Again, no PC speaker at the moment here, so can't actually test this. Yes, it works as you say, a verry short beep happens at the echoed position. bleeps Not 100% sure, but I believe this controls whether one hears beeps through the PC speaker when using speakup's review commands. If no one jumps in on this, I'll experiment when at a machine with a working PC speaker, and will reply back with details. Yes, when 0 is echoed to /sys/accessibility/speakup/bleeps, review beeps stop. the default seem to be 3, so I suppose it controls more than just on or off. When set to zero, the bell still sounds when, e.g. in a terminal at a bash prompt, one press backspace. > bleep_time Again, not 100% sure, but I believe this controls the duration of the PC speaker beeps speakup produces. I'm not sure of the units this is in either, possibly jiffys. I'll come back with more details on this one if no one else does. Yes, it seems to control the time as you say, verry small units though. It was 30 and I could set it to 180, but not 360. At 180, the bleeps are clearly a little longer, but not much. cursor_time Don't know. As far as I know, one can set cursor_time to a higher value when working e.g. over a slow connection. When a connection is very slow, with the default setting, when moving with the arrows, or backspacing etc. speakup says the incorrect characters. I am not 100% sure though, but seem to recall having used such a setting in the past when working over dialup. delimiters Don't know. I've tried echoing various characters to this and looking for differences when reviewing the screen, but no luck. ex_num Don't know. key_echo Controls if speakup speaks keys when they are typed. One = on, zero = off or don't echo keys. keymap I believe this is the currently active kernel keymap. I'm not sure of the format, probably what dumpkeys(1) and showkey(1) use. Echoing different values here should allow for remapping speakup's review commands besides remapping the keyboard as a whole. no_interrupt Controls if typing interrupts output from speakup. With no_interrupt set to zero, typing on the keyboard will interrupt speakup if for example the say screen command is used before the entire screen is read. With no_interrupt set to one, if the say screen command is used, and one then types on the keyboard, speakup will continue to say the whole screen regardless until it finishes. punc_all This is a list of all the punctuation speakup should speak when punc_level is set to four. punc_level Controls the level of punctuation spoken as the screen is displayed, not reviewed. Levels range from zero no punctuation, to four, all punctuation. As far as I can tell, one corresponds to punc_some, two corresponds to punc_most, and three as well as four seem to both correspond to punc_all, though I do stand to be corrected. I am using the soft synthesizer driver, so it is possible that some hardware synthesizers have different levels each corresponding to three and four for punc_level. Also note that if
Re: [PATCH v2 0/6] staging: speakup: speakup_soft.c checkpatch modifications
On Wed, Nov 23, 2016 at 04:56:32PM +0100, Greg KH wrote:
> On Wed, Nov 23, 2016 at 05:52:25AM -0500, Fleetwood Farm wrote:
> > On Nov 23, 2016 4:08 AM, "Greg KH" <gre...@linuxfoundation.org> wrote:
> > >
> > > On Mon, Nov 21, 2016 at 10:19:19AM -0500, Walt Feasel wrote:
> > > > Make Linux kernel style modifications for speak_soft.c to include:
> > > >
> > > > Space around operator
> > > > Logical continuation
> > > > Multiple blank lines
> > > > Blank line after {
> > > > comment modifications
> > > > Align parenthesis
> > >
> > > Ok, now that you have a bunch of cleanup patches accepted, why not work
> > > on some "real" code changes? There's no need to fix all of the coding
> > > style issues in drivers/staging/ at once, leave some for other people to
> > > learn on :)
> > >
> > > thanks,
> > >
> > > greg k-h
> >
> > Well, I have around 40 more patches already prepared waiting for my limit to
> > clear (which just did) and about 12 more files left to checkpatch in
> > speakup.
> > I am currently waiting on the newbies administer to clear my sent emails
> > asking
> > advice on if some of my tougher challenges (octals and CamelCase) are done
> > correctly.
>
> "newbies administrator"?
>
Yes have a email saying my email "is being held until the list moderator can
review it for approval"
> > I am also currently waiting on the u-boot mailing list administer to do the
> > same on some of my patches.
> > I also am doing some online 'c' courses to increase (get) my skills set.
> > What type of "real" code changes did you have in mind with my limited skill
> > set?
>
> I'd strongly suggest working on some userspace programs to get a
> less-limited skill set :) Then find some area of the kernel you are
> interested in, and help out there. Speakup really can use the help, and
> the community of users of their devices is very good, so any real work
> you can do there would always be greatly appreciated.
>
That is good advice about limiting skill set. I am trying to do that with
converting some of my simple bash scripts to 'c'. While it may not be very
usefull it is a start and won't mess up anything important for others.
I do think I am learning from these simple checkpatch patches as I try to
research the items I do not know. Plus I think it instills a good style
format. I have written programs in the past for my jobs but never in 'c'
and this driver stuff is over my head.
I do not wish to burden/annoy anyone with these simple fixes, I thought
it may help with getting them out of staging. I won't take offense if it is
preferred I did not do them.
I am not very quick on subtleties so if anyone wishes for me to move on I will.
> best of luck,
>
> greg k-h
Walt
Re: [PATCH v2 0/6] staging: speakup: speakup_soft.c checkpatch modifications
On Wed, Nov 23, 2016 at 04:56:32PM +0100, Greg KH wrote:
> On Wed, Nov 23, 2016 at 05:52:25AM -0500, Fleetwood Farm wrote:
> > On Nov 23, 2016 4:08 AM, "Greg KH" wrote:
> > >
> > > On Mon, Nov 21, 2016 at 10:19:19AM -0500, Walt Feasel wrote:
> > > > Make Linux kernel style modifications for speak_soft.c to include:
> > > >
> > > > Space around operator
> > > > Logical continuation
> > > > Multiple blank lines
> > > > Blank line after {
> > > > comment modifications
> > > > Align parenthesis
> > >
> > > Ok, now that you have a bunch of cleanup patches accepted, why not work
> > > on some "real" code changes? There's no need to fix all of the coding
> > > style issues in drivers/staging/ at once, leave some for other people to
> > > learn on :)
> > >
> > > thanks,
> > >
> > > greg k-h
> >
> > Well, I have around 40 more patches already prepared waiting for my limit to
> > clear (which just did) and about 12 more files left to checkpatch in
> > speakup.
> > I am currently waiting on the newbies administer to clear my sent emails
> > asking
> > advice on if some of my tougher challenges (octals and CamelCase) are done
> > correctly.
>
> "newbies administrator"?
>
Yes have a email saying my email "is being held until the list moderator can
review it for approval"
> > I am also currently waiting on the u-boot mailing list administer to do the
> > same on some of my patches.
> > I also am doing some online 'c' courses to increase (get) my skills set.
> > What type of "real" code changes did you have in mind with my limited skill
> > set?
>
> I'd strongly suggest working on some userspace programs to get a
> less-limited skill set :) Then find some area of the kernel you are
> interested in, and help out there. Speakup really can use the help, and
> the community of users of their devices is very good, so any real work
> you can do there would always be greatly appreciated.
>
That is good advice about limiting skill set. I am trying to do that with
converting some of my simple bash scripts to 'c'. While it may not be very
usefull it is a start and won't mess up anything important for others.
I do think I am learning from these simple checkpatch patches as I try to
research the items I do not know. Plus I think it instills a good style
format. I have written programs in the past for my jobs but never in 'c'
and this driver stuff is over my head.
I do not wish to burden/annoy anyone with these simple fixes, I thought
it may help with getting them out of staging. I won't take offense if it is
preferred I did not do them.
I am not very quick on subtleties so if anyone wishes for me to move on I will.
> best of luck,
>
> greg k-h
Walt
[PATCH v2 1/2] staging: speakup: speakup_spkout.c comment modifications
Make modifications to comments
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_spkout.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/speakup/speakup_spkout.c
b/drivers/staging/speakup/speakup_spkout.c
index e449f27..2220375 100644
--- a/drivers/staging/speakup/speakup_spkout.c
+++ b/drivers/staging/speakup/speakup_spkout.c
@@ -1,6 +1,6 @@
/*
* originally written by: Kirk Reiser <k...@braille.uwo.ca>
-* this version considerably modified by David Borowski, david...@rogers.com
+ * this version considerably modified by David Borowski, david...@rogers.com
*
* Copyright (C) 1998-99 Kirk Reiser.
* Copyright (C) 2003 David Borowski.
@@ -40,9 +40,8 @@ static struct var_t vars[] = {
V_LAST_VAR
};
-/*
- * These attributes will appear in /sys/accessibility/speakup/spkout.
- */
+/* These attributes will appear in /sys/accessibility/speakup/spkout. */
+
static struct kobj_attribute caps_start_attribute =
__ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute caps_stop_attribute =
--
2.1.4
[PATCH v2 1/2] staging: speakup: speakup_spkout.c comment modifications
Make modifications to comments
Signed-off-by: Walt Feasel
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_spkout.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/speakup/speakup_spkout.c
b/drivers/staging/speakup/speakup_spkout.c
index e449f27..2220375 100644
--- a/drivers/staging/speakup/speakup_spkout.c
+++ b/drivers/staging/speakup/speakup_spkout.c
@@ -1,6 +1,6 @@
/*
* originally written by: Kirk Reiser
-* this version considerably modified by David Borowski, david...@rogers.com
+ * this version considerably modified by David Borowski, david...@rogers.com
*
* Copyright (C) 1998-99 Kirk Reiser.
* Copyright (C) 2003 David Borowski.
@@ -40,9 +40,8 @@ static struct var_t vars[] = {
V_LAST_VAR
};
-/*
- * These attributes will appear in /sys/accessibility/speakup/spkout.
- */
+/* These attributes will appear in /sys/accessibility/speakup/spkout. */
+
static struct kobj_attribute caps_start_attribute =
__ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute caps_stop_attribute =
--
2.1.4
[PATCH v2 2/6] staging: speakup: speakup_soft.c Logical continuation
Make suggested checkpatch modification for
CHECK: Logical continuations should be on the
previous line
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_soft.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/speakup/speakup_soft.c
b/drivers/staging/speakup/speakup_soft.c
index 1697b4f..de6b35a 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -162,8 +162,8 @@ static char *get_initstring(void)
cp = buf;
var = synth_soft.vars;
while (var->var_id != MAXVARS) {
- if (var->var_id != CAPS_START && var->var_id != CAPS_STOP
- && var->var_id != DIRECT)
+ if (var->var_id != CAPS_START && var->var_id != CAPS_STOP &&
+ var->var_id != DIRECT)
cp = cp + sprintf(cp, var->u.n.synth_fmt,
var->u.n.value);
var++;
--
2.1.4
[PATCH v2 1/6] staging: speakup: speakup_soft.c Space around operator
Make suggested checkpatch modification for
CHECK: spaces preferred around that '|'
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_soft.c | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/speakup/speakup_soft.c
b/drivers/staging/speakup/speakup_soft.c
index 6b1d0f5..1697b4f 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -59,23 +59,23 @@ static struct var_t vars[] = {
* These attributes will appear in /sys/accessibility/speakup/soft.
*/
static struct kobj_attribute caps_start_attribute =
- __ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(caps_start, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute caps_stop_attribute =
- __ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(caps_stop, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute freq_attribute =
- __ATTR(freq, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(freq, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute pitch_attribute =
- __ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(pitch, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute punct_attribute =
- __ATTR(punct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(punct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute rate_attribute =
- __ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(rate, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute tone_attribute =
- __ATTR(tone, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(tone, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute voice_attribute =
- __ATTR(voice, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(voice, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute vol_attribute =
- __ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(vol, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
/*
* We should uncomment the following definition, when we agree on a
@@ -85,15 +85,15 @@ static struct kobj_attribute vol_attribute =
*/
static struct kobj_attribute delay_time_attribute =
- __ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(delay_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute direct_attribute =
- __ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(direct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute full_time_attribute =
- __ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(full_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute jiffy_delta_attribute =
- __ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(jiffy_delta, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute trigger_time_attribute =
- __ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(trigger_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
/*
* Create a group of attributes so that we can create and destroy them all
--
2.1.4
[PATCH v2 2/6] staging: speakup: speakup_soft.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/speakup_soft.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/speakup/speakup_soft.c
b/drivers/staging/speakup/speakup_soft.c
index 1697b4f..de6b35a 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -162,8 +162,8 @@ static char *get_initstring(void)
cp = buf;
var = synth_soft.vars;
while (var->var_id != MAXVARS) {
- if (var->var_id != CAPS_START && var->var_id != CAPS_STOP
- && var->var_id != DIRECT)
+ if (var->var_id != CAPS_START && var->var_id != CAPS_STOP &&
+ var->var_id != DIRECT)
cp = cp + sprintf(cp, var->u.n.synth_fmt,
var->u.n.value);
var++;
--
2.1.4
[PATCH v2 1/6] staging: speakup: speakup_soft.c Space around operator
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/speakup_soft.c | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/speakup/speakup_soft.c
b/drivers/staging/speakup/speakup_soft.c
index 6b1d0f5..1697b4f 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -59,23 +59,23 @@ static struct var_t vars[] = {
* These attributes will appear in /sys/accessibility/speakup/soft.
*/
static struct kobj_attribute caps_start_attribute =
- __ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(caps_start, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute caps_stop_attribute =
- __ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(caps_stop, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute freq_attribute =
- __ATTR(freq, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(freq, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute pitch_attribute =
- __ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(pitch, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute punct_attribute =
- __ATTR(punct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(punct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute rate_attribute =
- __ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(rate, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute tone_attribute =
- __ATTR(tone, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(tone, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute voice_attribute =
- __ATTR(voice, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(voice, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute vol_attribute =
- __ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(vol, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
/*
* We should uncomment the following definition, when we agree on a
@@ -85,15 +85,15 @@ static struct kobj_attribute vol_attribute =
*/
static struct kobj_attribute delay_time_attribute =
- __ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(delay_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute direct_attribute =
- __ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(direct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute full_time_attribute =
- __ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(full_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute jiffy_delta_attribute =
- __ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(jiffy_delta, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute trigger_time_attribute =
- __ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(trigger_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
/*
* Create a group of attributes so that we can create and destroy them all
--
2.1.4
[PATCH v2 3/6] staging: speakup: speakup_soft.c Multiple blank lines
Make suggested checkpatch modification for
CHECK: Please don't use multiple blank lines
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_soft.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/speakup/speakup_soft.c
b/drivers/staging/speakup/speakup_soft.c
index de6b35a..9308b7e 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -310,7 +310,6 @@ static const struct file_operations softsynth_fops = {
.release = softsynth_close,
};
-
static int softsynth_probe(struct spk_synth *synth)
{
--
2.1.4
[PATCH v2 3/6] staging: speakup: speakup_soft.c Multiple 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/speakup/speakup_soft.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/speakup/speakup_soft.c
b/drivers/staging/speakup/speakup_soft.c
index de6b35a..9308b7e 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -310,7 +310,6 @@ static const struct file_operations softsynth_fops = {
.release = softsynth_close,
};
-
static int softsynth_probe(struct spk_synth *synth)
{
--
2.1.4
[PATCH v2 5/6] staging: speakup: speakup_soft.c comment modifications
Make modifications to comment style
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_soft.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/speakup/speakup_soft.c
b/drivers/staging/speakup/speakup_soft.c
index dfddd26..50973cf 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -20,8 +20,8 @@
*/
#include
-#include /* for misc_register, and SYNTH_MINOR */
-#include /* for poll_wait() */
+#include /* for misc_register, and SYNTH_MINOR */
+#include /* for poll_wait() */
#include /* schedule(), signal_pending(), TASK_INTERRUPTIBLE */
#include "spk_priv.h"
@@ -55,9 +55,8 @@ static struct var_t vars[] = {
V_LAST_VAR
};
-/*
- * These attributes will appear in /sys/accessibility/speakup/soft.
- */
+/* These attributes will appear in /sys/accessibility/speakup/soft. */
+
static struct kobj_attribute caps_start_attribute =
__ATTR(caps_start, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute caps_stop_attribute =
--
2.1.4
[PATCH v2 5/6] staging: speakup: speakup_soft.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/speakup_soft.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/speakup/speakup_soft.c
b/drivers/staging/speakup/speakup_soft.c
index dfddd26..50973cf 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -20,8 +20,8 @@
*/
#include
-#include /* for misc_register, and SYNTH_MINOR */
-#include /* for poll_wait() */
+#include /* for misc_register, and SYNTH_MINOR */
+#include /* for poll_wait() */
#include /* schedule(), signal_pending(), TASK_INTERRUPTIBLE */
#include "spk_priv.h"
@@ -55,9 +55,8 @@ static struct var_t vars[] = {
V_LAST_VAR
};
-/*
- * These attributes will appear in /sys/accessibility/speakup/soft.
- */
+/* These attributes will appear in /sys/accessibility/speakup/soft. */
+
static struct kobj_attribute caps_start_attribute =
__ATTR(caps_start, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute caps_stop_attribute =
--
2.1.4
[PATCH v2 0/6] staging: speakup: speakup_soft.c checkpatch modifications
Make Linux kernel style modifications for speak_soft.c to include:
Space around operator
Logical continuation
Multiple blank lines
Blank line after {
comment modifications
Align parenthesis
Walt Feasel (6):
staging: speakup: speakup_soft.c Space around operator
staging: speakup: speakup_soft.c Logical continuation
staging: speakup: speakup_soft.c Multiple blank lines
staging: speakup: speakup_soft.c Blank line after {
staging: speakup: speakup_soft.c comment modifications
staging: speakup: speakup_soft.c Align parenthesis
drivers/staging/speakup/speakup_soft.c | 46 --
1 file changed, 21 insertions(+), 25 deletions(-)
--
v2 makes changes to correct for email format patch submission
2.1.4
[PATCH v2 0/6] staging: speakup: speakup_soft.c checkpatch modifications
Make Linux kernel style modifications for speak_soft.c to include:
Space around operator
Logical continuation
Multiple blank lines
Blank line after {
comment modifications
Align parenthesis
Walt Feasel (6):
staging: speakup: speakup_soft.c Space around operator
staging: speakup: speakup_soft.c Logical continuation
staging: speakup: speakup_soft.c Multiple blank lines
staging: speakup: speakup_soft.c Blank line after {
staging: speakup: speakup_soft.c comment modifications
staging: speakup: speakup_soft.c Align parenthesis
drivers/staging/speakup/speakup_soft.c | 46 --
1 file changed, 21 insertions(+), 25 deletions(-)
--
v2 makes changes to correct for email format patch submission
2.1.4
[PATCH v2 6/6] staging: speakup: speakup_soft.c Align parenthesis
Make suggested checkpatch modification for
CHECK: Alignment should match open parenthesis
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_soft.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/speakup/speakup_soft.c
b/drivers/staging/speakup/speakup_soft.c
index 50973cf..ed3e428 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -276,8 +276,7 @@ static ssize_t softsynth_write(struct file *fp, const char
__user *buf,
return count;
}
-static unsigned int softsynth_poll(struct file *fp,
- struct poll_table_struct *wait)
+static unsigned int softsynth_poll(struct file *fp, struct poll_table_struct
*wait)
{
unsigned long flags;
int ret = 0;
--
2.1.4
[PATCH v2 6/6] staging: speakup: speakup_soft.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/speakup_soft.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/speakup/speakup_soft.c
b/drivers/staging/speakup/speakup_soft.c
index 50973cf..ed3e428 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -276,8 +276,7 @@ static ssize_t softsynth_write(struct file *fp, const char
__user *buf,
return count;
}
-static unsigned int softsynth_poll(struct file *fp,
- struct poll_table_struct *wait)
+static unsigned int softsynth_poll(struct file *fp, struct poll_table_struct
*wait)
{
unsigned long flags;
int ret = 0;
--
2.1.4
[PATCH v2 4/6] staging: speakup: speakup_soft.c Blank line after {
Make suggested checkpatch modification for
CHECK: Blank lines aren't necessary after an
open brace '{'
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_soft.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/speakup/speakup_soft.c
b/drivers/staging/speakup/speakup_soft.c
index 9308b7e..dfddd26 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -312,7 +312,6 @@ static const struct file_operations softsynth_fops = {
static int softsynth_probe(struct spk_synth *synth)
{
-
if (misc_registered != 0)
return 0;
memset(_device, 0, sizeof(synth_device));
--
2.1.4
[PATCH v2 4/6] staging: speakup: speakup_soft.c Blank line after {
Make suggested checkpatch modification for
CHECK: Blank lines aren't necessary after an
open brace '{'
Signed-off-by: Walt Feasel
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_soft.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/speakup/speakup_soft.c
b/drivers/staging/speakup/speakup_soft.c
index 9308b7e..dfddd26 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -312,7 +312,6 @@ static const struct file_operations softsynth_fops = {
static int softsynth_probe(struct spk_synth *synth)
{
-
if (misc_registered != 0)
return 0;
memset(_device, 0, sizeof(synth_device));
--
2.1.4
[PATCH v2 0/2] staging: speakup: speakup_spkout.c checkpatch modifications
Make Linux kernel style modifications for speakup_spkout.c to include: comment modifications Space around operator Walt Feasel (2): staging: speakup: speakup_spkout.c comment modifications staging: speakup: speakup_spkout.c Space around operator drivers/staging/speakup/speakup_spkout.c | 31 +++ 1 file changed, 15 insertions(+), 16 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4
[PATCH v2 0/2] staging: speakup: speakup_spkout.c checkpatch modifications
Make Linux kernel style modifications for speakup_spkout.c to include: comment modifications Space around operator Walt Feasel (2): staging: speakup: speakup_spkout.c comment modifications staging: speakup: speakup_spkout.c Space around operator drivers/staging/speakup/speakup_spkout.c | 31 +++ 1 file changed, 15 insertions(+), 16 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4
[PATCH v2 2/2] staging: speakup: speakup_spkout.c Space around operator
Make suggested checkpatch modification for
CHECK: spaces preferred around that '|'
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_spkout.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/speakup/speakup_spkout.c
b/drivers/staging/speakup/speakup_spkout.c
index 2220375..5868909 100644
--- a/drivers/staging/speakup/speakup_spkout.c
+++ b/drivers/staging/speakup/speakup_spkout.c
@@ -43,30 +43,30 @@ static struct var_t vars[] = {
/* These attributes will appear in /sys/accessibility/speakup/spkout. */
static struct kobj_attribute caps_start_attribute =
- __ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(caps_start, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute caps_stop_attribute =
- __ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(caps_stop, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute pitch_attribute =
- __ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(pitch, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute punct_attribute =
- __ATTR(punct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(punct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute rate_attribute =
- __ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(rate, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute tone_attribute =
- __ATTR(tone, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(tone, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute vol_attribute =
- __ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(vol, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute delay_time_attribute =
- __ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(delay_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute direct_attribute =
- __ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(direct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute full_time_attribute =
- __ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(full_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute jiffy_delta_attribute =
- __ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(jiffy_delta, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute trigger_time_attribute =
- __ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(trigger_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
/*
* Create a group of attributes so that we can create and destroy them all
--
2.1.4
[PATCH v2 2/2] staging: speakup: speakup_spkout.c Space around operator
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/speakup_spkout.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/speakup/speakup_spkout.c
b/drivers/staging/speakup/speakup_spkout.c
index 2220375..5868909 100644
--- a/drivers/staging/speakup/speakup_spkout.c
+++ b/drivers/staging/speakup/speakup_spkout.c
@@ -43,30 +43,30 @@ static struct var_t vars[] = {
/* These attributes will appear in /sys/accessibility/speakup/spkout. */
static struct kobj_attribute caps_start_attribute =
- __ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(caps_start, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute caps_stop_attribute =
- __ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(caps_stop, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute pitch_attribute =
- __ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(pitch, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute punct_attribute =
- __ATTR(punct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(punct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute rate_attribute =
- __ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(rate, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute tone_attribute =
- __ATTR(tone, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(tone, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute vol_attribute =
- __ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(vol, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute delay_time_attribute =
- __ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(delay_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute direct_attribute =
- __ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(direct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute full_time_attribute =
- __ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(full_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute jiffy_delta_attribute =
- __ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(jiffy_delta, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute trigger_time_attribute =
- __ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(trigger_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
/*
* Create a group of attributes so that we can create and destroy them all
--
2.1.4
[PATCH v2 0/2] staging: speakup: speakup_txprt.c checkpatch modifications
Make Linux kernel style modifications to speakup-txprt.c to include: Comment modifications Spaces preferred around operator Walt Feasel (2): staging: speakup: speakup_txprt.c Comment modifications staging: speakup: speakup_txprt.c Spaces preferred around operator drivers/staging/speakup/speakup_txprt.c | 29 ++--- 1 file changed, 14 insertions(+), 15 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4
[PATCH v2 0/2] staging: speakup: speakup_txprt.c checkpatch modifications
Make Linux kernel style modifications to speakup-txprt.c to include: Comment modifications Spaces preferred around operator Walt Feasel (2): staging: speakup: speakup_txprt.c Comment modifications staging: speakup: speakup_txprt.c Spaces preferred around operator drivers/staging/speakup/speakup_txprt.c | 29 ++--- 1 file changed, 14 insertions(+), 15 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4
[PATCH v2 2/2] staging: speakup: speakup_txprt.c Spaces preferred around operator
Make suggested checkpatch modification for
CHECK: spaces preferred around that '|'
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_txprt.c | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/speakup/speakup_txprt.c
b/drivers/staging/speakup/speakup_txprt.c
index 57feffa..b3d2cfd 100644
--- a/drivers/staging/speakup/speakup_txprt.c
+++ b/drivers/staging/speakup/speakup_txprt.c
@@ -39,28 +39,28 @@ static struct var_t vars[] = {
/* These attributes will appear in /sys/accessibility/speakup/txprt. */
static struct kobj_attribute caps_start_attribute =
- __ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(caps_start, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute caps_stop_attribute =
- __ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(caps_stop, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute pitch_attribute =
- __ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(pitch, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute rate_attribute =
- __ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(rate, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute tone_attribute =
- __ATTR(tone, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(tone, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute vol_attribute =
- __ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(vol, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute delay_time_attribute =
- __ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(delay_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute direct_attribute =
- __ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(direct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute full_time_attribute =
- __ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(full_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute jiffy_delta_attribute =
- __ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(jiffy_delta, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute trigger_time_attribute =
- __ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(trigger_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
/*
* Create a group of attributes so that we can create and destroy them all
--
2.1.4
[PATCH v2 1/2] staging: speakup: speakup_txprt.c Comment modifications
Make modifications to comments
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_txprt.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/speakup/speakup_txprt.c
b/drivers/staging/speakup/speakup_txprt.c
index fd98d4f..57feffa 100644
--- a/drivers/staging/speakup/speakup_txprt.c
+++ b/drivers/staging/speakup/speakup_txprt.c
@@ -1,6 +1,6 @@
/*
* originally written by: Kirk Reiser <k...@braille.uwo.ca>
-* this version considerably modified by David Borowski, david...@rogers.com
+ * this version considerably modified by David Borowski, david...@rogers.com
*
* Copyright (C) 1998-99 Kirk Reiser.
* Copyright (C) 2003 David Borowski.
@@ -36,9 +36,8 @@ static struct var_t vars[] = {
V_LAST_VAR
};
-/*
- * These attributes will appear in /sys/accessibility/speakup/txprt.
- */
+/* These attributes will appear in /sys/accessibility/speakup/txprt. */
+
static struct kobj_attribute caps_start_attribute =
__ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute caps_stop_attribute =
--
2.1.4
[PATCH v2 2/2] staging: speakup: speakup_txprt.c Spaces preferred around operator
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/speakup_txprt.c | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/speakup/speakup_txprt.c
b/drivers/staging/speakup/speakup_txprt.c
index 57feffa..b3d2cfd 100644
--- a/drivers/staging/speakup/speakup_txprt.c
+++ b/drivers/staging/speakup/speakup_txprt.c
@@ -39,28 +39,28 @@ static struct var_t vars[] = {
/* These attributes will appear in /sys/accessibility/speakup/txprt. */
static struct kobj_attribute caps_start_attribute =
- __ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(caps_start, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute caps_stop_attribute =
- __ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(caps_stop, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute pitch_attribute =
- __ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(pitch, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute rate_attribute =
- __ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(rate, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute tone_attribute =
- __ATTR(tone, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(tone, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute vol_attribute =
- __ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(vol, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute delay_time_attribute =
- __ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(delay_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute direct_attribute =
- __ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(direct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute full_time_attribute =
- __ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(full_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute jiffy_delta_attribute =
- __ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(jiffy_delta, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute trigger_time_attribute =
- __ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+ __ATTR(trigger_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
/*
* Create a group of attributes so that we can create and destroy them all
--
2.1.4
[PATCH v2 1/2] staging: speakup: speakup_txprt.c Comment modifications
Make modifications to comments
Signed-off-by: Walt Feasel
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/speakup_txprt.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/speakup/speakup_txprt.c
b/drivers/staging/speakup/speakup_txprt.c
index fd98d4f..57feffa 100644
--- a/drivers/staging/speakup/speakup_txprt.c
+++ b/drivers/staging/speakup/speakup_txprt.c
@@ -1,6 +1,6 @@
/*
* originally written by: Kirk Reiser
-* this version considerably modified by David Borowski, david...@rogers.com
+ * this version considerably modified by David Borowski, david...@rogers.com
*
* Copyright (C) 1998-99 Kirk Reiser.
* Copyright (C) 2003 David Borowski.
@@ -36,9 +36,8 @@ static struct var_t vars[] = {
V_LAST_VAR
};
-/*
- * These attributes will appear in /sys/accessibility/speakup/txprt.
- */
+/* These attributes will appear in /sys/accessibility/speakup/txprt. */
+
static struct kobj_attribute caps_start_attribute =
__ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
static struct kobj_attribute caps_stop_attribute =
--
2.1.4
[PATCH v2 1/2] staging: speakup: spk_priv_keyinfo.h align columns
Make modifications to align columns Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/speakup/spk_priv_keyinfo.h | 104 ++--- 1 file changed, 51 insertions(+), 53 deletions(-) diff --git a/drivers/staging/speakup/spk_priv_keyinfo.h b/drivers/staging/speakup/spk_priv_keyinfo.h index 130e9cb..742f84a 100644 --- a/drivers/staging/speakup/spk_priv_keyinfo.h +++ b/drivers/staging/speakup/spk_priv_keyinfo.h @@ -23,60 +23,58 @@ #define FIRST_SYNTH_VAR RATE /* 0 is reserved for no remap */ -#define SPEAKUP_GOTO 0x01 -#define SPEECH_KILL 0x02 -#define SPEAKUP_QUIET 0x03 -#define SPEAKUP_CUT 0x04 -#define SPEAKUP_PASTE 0x05 -#define SAY_FIRST_CHAR 0x06 -#define SAY_LAST_CHAR 0x07 -#define SAY_CHAR 0x08 -#define SAY_PREV_CHAR 0x09 -#define SAY_NEXT_CHAR 0x0a -#define SAY_WORD 0x0b -#define SAY_PREV_WORD 0x0c -#define SAY_NEXT_WORD 0x0d -#define SAY_LINE 0x0e -#define SAY_PREV_LINE 0x0f -#define SAY_NEXT_LINE 0x10 -#define TOP_EDGE 0x11 -#define BOTTOM_EDGE 0x12 -#define LEFT_EDGE 0x13 -#define RIGHT_EDGE 0x14 -#define SPELL_PHONETIC 0x15 -#define SPELL_WORD 0x16 -#define SAY_SCREEN 0x17 -#define SAY_POSITION 0x18 -#define SAY_ATTRIBUTES 0x19 -#define SPEAKUP_OFF 0x1a -#define SPEAKUP_PARKED 0x1b -#define SAY_LINE_INDENT 0x1c -#define SAY_FROM_TOP 0x1d -#define SAY_TO_BOTTOM 0x1e -#define SAY_FROM_LEFT 0x1f -#define SAY_TO_RIGHT 0x20 -#define SAY_CHAR_NUM 0x21 -#define EDIT_SOME 0x22 -#define EDIT_MOST 0x23 -#define SAY_PHONETIC_CHAR 0x24 -#define EDIT_DELIM 0x25 -#define EDIT_REPEAT 0x26 -#define EDIT_EXNUM 0x27 -#define SET_WIN 0x28 -#define CLEAR_WIN 0x29 -#define ENABLE_WIN 0x2a -#define SAY_WIN 0x2b -#define SPK_LOCK 0x2c -#define SPEAKUP_HELP 0x2d -#define TOGGLE_CURSORING 0x2e -#define READ_ALL_DOC 0x2f -#define SPKUP_MAX_FUNC 0x30 /* one greater than the last func handler */ - -#define SPK_KEY 0x80 -#define FIRST_EDIT_BITS 0x22 - +#define SPEAKUP_GOTO 0x01 +#define SPEECH_KILL0x02 +#define SPEAKUP_QUIET 0x03 +#define SPEAKUP_CUT0x04 +#define SPEAKUP_PASTE 0x05 +#define SAY_FIRST_CHAR 0x06 +#define SAY_LAST_CHAR 0x07 +#define SAY_CHAR 0x08 +#define SAY_PREV_CHAR 0x09 +#define SAY_NEXT_CHAR 0x0a +#define SAY_WORD 0x0b +#define SAY_PREV_WORD 0x0c +#define SAY_NEXT_WORD 0x0d +#define SAY_LINE 0x0e +#define SAY_PREV_LINE 0x0f +#define SAY_NEXT_LINE 0x10 +#define TOP_EDGE 0x11 +#define BOTTOM_EDGE0x12 +#define LEFT_EDGE 0x13 +#define RIGHT_EDGE 0x14 +#define SPELL_PHONETIC 0x15 +#define SPELL_WORD 0x16 +#define SAY_SCREEN 0x17 +#define SAY_POSITION 0x18 +#define SAY_ATTRIBUTES 0x19 +#define SPEAKUP_OFF0x1a +#define SPEAKUP_PARKED 0x1b +#define SAY_LINE_INDENT0x1c +#define SAY_FROM_TOP 0x1d +#define SAY_TO_BOTTOM 0x1e +#define SAY_FROM_LEFT 0x1f +#define SAY_TO_RIGHT 0x20 +#define SAY_CHAR_NUM 0x21 +#define EDIT_SOME 0x22 +#define EDIT_MOST 0x23 +#define SAY_PHONETIC_CHAR 0x24 +#define EDIT_DELIM 0x25 +#define EDIT_REPEAT0x26 +#define EDIT_EXNUM 0x27 +#define SET_WIN0x28 +#define CLEAR_WIN 0x29 +#define ENABLE_WIN 0x2a +#define SAY_WIN0x2b +#define SPK_LOCK 0x2c +#define SPEAKUP_HELP 0x2d +#define TOGGLE_CURSORING 0x2e +#define READ_ALL_DOC 0x2f +#define SPKUP_MAX_FUNC 0x30 /* one greater than the last func handler */ +#define SPK_KEY0x80 +#define FIRST_EDIT_BITS0x22 #define FIRST_SET_VAR SPELL_DELAY -#define VAR_START 0x40 /* increase if adding more than 0x3f functions */ +#define VAR_START 0x40 /* increase if adding more than 0x3f functions */ /* keys for setting variables, must be ordered same as the enum for var_ids */ /* with dec being even and inc being 1 greater */ -- 2.1.4
[PATCH v2 1/2] staging: speakup: spk_priv_keyinfo.h align columns
Make modifications to align columns Signed-off-by: Walt Feasel --- v2 makes changes to correct for email format patch submission drivers/staging/speakup/spk_priv_keyinfo.h | 104 ++--- 1 file changed, 51 insertions(+), 53 deletions(-) diff --git a/drivers/staging/speakup/spk_priv_keyinfo.h b/drivers/staging/speakup/spk_priv_keyinfo.h index 130e9cb..742f84a 100644 --- a/drivers/staging/speakup/spk_priv_keyinfo.h +++ b/drivers/staging/speakup/spk_priv_keyinfo.h @@ -23,60 +23,58 @@ #define FIRST_SYNTH_VAR RATE /* 0 is reserved for no remap */ -#define SPEAKUP_GOTO 0x01 -#define SPEECH_KILL 0x02 -#define SPEAKUP_QUIET 0x03 -#define SPEAKUP_CUT 0x04 -#define SPEAKUP_PASTE 0x05 -#define SAY_FIRST_CHAR 0x06 -#define SAY_LAST_CHAR 0x07 -#define SAY_CHAR 0x08 -#define SAY_PREV_CHAR 0x09 -#define SAY_NEXT_CHAR 0x0a -#define SAY_WORD 0x0b -#define SAY_PREV_WORD 0x0c -#define SAY_NEXT_WORD 0x0d -#define SAY_LINE 0x0e -#define SAY_PREV_LINE 0x0f -#define SAY_NEXT_LINE 0x10 -#define TOP_EDGE 0x11 -#define BOTTOM_EDGE 0x12 -#define LEFT_EDGE 0x13 -#define RIGHT_EDGE 0x14 -#define SPELL_PHONETIC 0x15 -#define SPELL_WORD 0x16 -#define SAY_SCREEN 0x17 -#define SAY_POSITION 0x18 -#define SAY_ATTRIBUTES 0x19 -#define SPEAKUP_OFF 0x1a -#define SPEAKUP_PARKED 0x1b -#define SAY_LINE_INDENT 0x1c -#define SAY_FROM_TOP 0x1d -#define SAY_TO_BOTTOM 0x1e -#define SAY_FROM_LEFT 0x1f -#define SAY_TO_RIGHT 0x20 -#define SAY_CHAR_NUM 0x21 -#define EDIT_SOME 0x22 -#define EDIT_MOST 0x23 -#define SAY_PHONETIC_CHAR 0x24 -#define EDIT_DELIM 0x25 -#define EDIT_REPEAT 0x26 -#define EDIT_EXNUM 0x27 -#define SET_WIN 0x28 -#define CLEAR_WIN 0x29 -#define ENABLE_WIN 0x2a -#define SAY_WIN 0x2b -#define SPK_LOCK 0x2c -#define SPEAKUP_HELP 0x2d -#define TOGGLE_CURSORING 0x2e -#define READ_ALL_DOC 0x2f -#define SPKUP_MAX_FUNC 0x30 /* one greater than the last func handler */ - -#define SPK_KEY 0x80 -#define FIRST_EDIT_BITS 0x22 - +#define SPEAKUP_GOTO 0x01 +#define SPEECH_KILL0x02 +#define SPEAKUP_QUIET 0x03 +#define SPEAKUP_CUT0x04 +#define SPEAKUP_PASTE 0x05 +#define SAY_FIRST_CHAR 0x06 +#define SAY_LAST_CHAR 0x07 +#define SAY_CHAR 0x08 +#define SAY_PREV_CHAR 0x09 +#define SAY_NEXT_CHAR 0x0a +#define SAY_WORD 0x0b +#define SAY_PREV_WORD 0x0c +#define SAY_NEXT_WORD 0x0d +#define SAY_LINE 0x0e +#define SAY_PREV_LINE 0x0f +#define SAY_NEXT_LINE 0x10 +#define TOP_EDGE 0x11 +#define BOTTOM_EDGE0x12 +#define LEFT_EDGE 0x13 +#define RIGHT_EDGE 0x14 +#define SPELL_PHONETIC 0x15 +#define SPELL_WORD 0x16 +#define SAY_SCREEN 0x17 +#define SAY_POSITION 0x18 +#define SAY_ATTRIBUTES 0x19 +#define SPEAKUP_OFF0x1a +#define SPEAKUP_PARKED 0x1b +#define SAY_LINE_INDENT0x1c +#define SAY_FROM_TOP 0x1d +#define SAY_TO_BOTTOM 0x1e +#define SAY_FROM_LEFT 0x1f +#define SAY_TO_RIGHT 0x20 +#define SAY_CHAR_NUM 0x21 +#define EDIT_SOME 0x22 +#define EDIT_MOST 0x23 +#define SAY_PHONETIC_CHAR 0x24 +#define EDIT_DELIM 0x25 +#define EDIT_REPEAT0x26 +#define EDIT_EXNUM 0x27 +#define SET_WIN0x28 +#define CLEAR_WIN 0x29 +#define ENABLE_WIN 0x2a +#define SAY_WIN0x2b +#define SPK_LOCK 0x2c +#define SPEAKUP_HELP 0x2d +#define TOGGLE_CURSORING 0x2e +#define READ_ALL_DOC 0x2f +#define SPKUP_MAX_FUNC 0x30 /* one greater than the last func handler */ +#define SPK_KEY0x80 +#define FIRST_EDIT_BITS0x22 #define FIRST_SET_VAR SPELL_DELAY -#define VAR_START 0x40 /* increase if adding more than 0x3f functions */ +#define VAR_START 0x40 /* increase if adding more than 0x3f functions */ /* keys for setting variables, must be ordered same as the enum for var_ids */ /* with dec being even and inc being 1 greater */ -- 2.1.4
[PATCH v2 0/2] stageing: speakup: spk_priv_keyinfo.h checkpatch modifications
Make Linux kernel style modifications to spk_priv_keyinfo.h to include: align columns Space around operator Walt Feasel (2): staging: speakup: spk_priv_keyinfo.h align columns staging: speakup: spk_priv_keyinfo.h Space around operator drivers/staging/speakup/spk_priv_keyinfo.h | 148 ++--- 1 file changed, 73 insertions(+), 75 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4
[PATCH v2 2/2] staging: speakup: spk_priv_keyinfo.h Space around operator
Make suggested checkpatch modification for CHECK: spaces preferred around that '+' Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/speakup/spk_priv_keyinfo.h | 44 +++--- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/staging/speakup/spk_priv_keyinfo.h b/drivers/staging/speakup/spk_priv_keyinfo.h index 742f84a..d3b4597 100644 --- a/drivers/staging/speakup/spk_priv_keyinfo.h +++ b/drivers/staging/speakup/spk_priv_keyinfo.h @@ -78,27 +78,27 @@ /* keys for setting variables, must be ordered same as the enum for var_ids */ /* with dec being even and inc being 1 greater */ -#define SPELL_DELAY_DEC (VAR_START+0) -#define SPELL_DELAY_INC (SPELL_DELAY_DEC+1) -#define PUNC_LEVEL_DEC (SPELL_DELAY_DEC+2) -#define PUNC_LEVEL_INC (PUNC_LEVEL_DEC+1) -#define READING_PUNC_DEC (PUNC_LEVEL_DEC+2) -#define READING_PUNC_INC (READING_PUNC_DEC+1) -#define ATTRIB_BLEEP_DEC (READING_PUNC_DEC+2) -#define ATTRIB_BLEEP_INC (ATTRIB_BLEEP_DEC+1) -#define BLEEPS_DEC (ATTRIB_BLEEP_DEC+2) -#define BLEEPS_INC (BLEEPS_DEC+1) -#define RATE_DEC (BLEEPS_DEC+2) -#define RATE_INC (RATE_DEC+1) -#define PITCH_DEC (RATE_DEC+2) -#define PITCH_INC (PITCH_DEC+1) -#define VOL_DEC (PITCH_DEC+2) -#define VOL_INC (VOL_DEC+1) -#define TONE_DEC (VOL_DEC+2) -#define TONE_INC (TONE_DEC+1) -#define PUNCT_DEC (TONE_DEC+2) -#define PUNCT_INC (PUNCT_DEC+1) -#define VOICE_DEC (PUNCT_DEC+2) -#define VOICE_INC (VOICE_DEC+1) +#define SPELL_DELAY_DEC (VAR_START + 0) +#define SPELL_DELAY_INC (SPELL_DELAY_DEC + 1) +#define PUNC_LEVEL_DEC (SPELL_DELAY_DEC + 2) +#define PUNC_LEVEL_INC (PUNC_LEVEL_DEC + 1) +#define READING_PUNC_DEC (PUNC_LEVEL_DEC + 2) +#define READING_PUNC_INC (READING_PUNC_DEC + 1) +#define ATTRIB_BLEEP_DEC (READING_PUNC_DEC + 2) +#define ATTRIB_BLEEP_INC (ATTRIB_BLEEP_DEC + 1) +#define BLEEPS_DEC (ATTRIB_BLEEP_DEC + 2) +#define BLEEPS_INC (BLEEPS_DEC + 1) +#define RATE_DEC (BLEEPS_DEC + 2) +#define RATE_INC (RATE_DEC + 1) +#define PITCH_DEC (RATE_DEC + 2) +#define PITCH_INC (PITCH_DEC + 1) +#define VOL_DEC (PITCH_DEC + 2) +#define VOL_INC (VOL_DEC + 1) +#define TONE_DEC (VOL_DEC + 2) +#define TONE_INC (TONE_DEC + 1) +#define PUNCT_DEC (TONE_DEC + 2) +#define PUNCT_INC (PUNCT_DEC + 1) +#define VOICE_DEC (PUNCT_DEC + 2) +#define VOICE_INC (VOICE_DEC + 1) #endif -- 2.1.4
[PATCH v2 0/2] stageing: speakup: spk_priv_keyinfo.h checkpatch modifications
Make Linux kernel style modifications to spk_priv_keyinfo.h to include: align columns Space around operator Walt Feasel (2): staging: speakup: spk_priv_keyinfo.h align columns staging: speakup: spk_priv_keyinfo.h Space around operator drivers/staging/speakup/spk_priv_keyinfo.h | 148 ++--- 1 file changed, 73 insertions(+), 75 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4
[PATCH v2 2/2] staging: speakup: spk_priv_keyinfo.h Space around operator
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/spk_priv_keyinfo.h | 44 +++--- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/staging/speakup/spk_priv_keyinfo.h b/drivers/staging/speakup/spk_priv_keyinfo.h index 742f84a..d3b4597 100644 --- a/drivers/staging/speakup/spk_priv_keyinfo.h +++ b/drivers/staging/speakup/spk_priv_keyinfo.h @@ -78,27 +78,27 @@ /* keys for setting variables, must be ordered same as the enum for var_ids */ /* with dec being even and inc being 1 greater */ -#define SPELL_DELAY_DEC (VAR_START+0) -#define SPELL_DELAY_INC (SPELL_DELAY_DEC+1) -#define PUNC_LEVEL_DEC (SPELL_DELAY_DEC+2) -#define PUNC_LEVEL_INC (PUNC_LEVEL_DEC+1) -#define READING_PUNC_DEC (PUNC_LEVEL_DEC+2) -#define READING_PUNC_INC (READING_PUNC_DEC+1) -#define ATTRIB_BLEEP_DEC (READING_PUNC_DEC+2) -#define ATTRIB_BLEEP_INC (ATTRIB_BLEEP_DEC+1) -#define BLEEPS_DEC (ATTRIB_BLEEP_DEC+2) -#define BLEEPS_INC (BLEEPS_DEC+1) -#define RATE_DEC (BLEEPS_DEC+2) -#define RATE_INC (RATE_DEC+1) -#define PITCH_DEC (RATE_DEC+2) -#define PITCH_INC (PITCH_DEC+1) -#define VOL_DEC (PITCH_DEC+2) -#define VOL_INC (VOL_DEC+1) -#define TONE_DEC (VOL_DEC+2) -#define TONE_INC (TONE_DEC+1) -#define PUNCT_DEC (TONE_DEC+2) -#define PUNCT_INC (PUNCT_DEC+1) -#define VOICE_DEC (PUNCT_DEC+2) -#define VOICE_INC (VOICE_DEC+1) +#define SPELL_DELAY_DEC (VAR_START + 0) +#define SPELL_DELAY_INC (SPELL_DELAY_DEC + 1) +#define PUNC_LEVEL_DEC (SPELL_DELAY_DEC + 2) +#define PUNC_LEVEL_INC (PUNC_LEVEL_DEC + 1) +#define READING_PUNC_DEC (PUNC_LEVEL_DEC + 2) +#define READING_PUNC_INC (READING_PUNC_DEC + 1) +#define ATTRIB_BLEEP_DEC (READING_PUNC_DEC + 2) +#define ATTRIB_BLEEP_INC (ATTRIB_BLEEP_DEC + 1) +#define BLEEPS_DEC (ATTRIB_BLEEP_DEC + 2) +#define BLEEPS_INC (BLEEPS_DEC + 1) +#define RATE_DEC (BLEEPS_DEC + 2) +#define RATE_INC (RATE_DEC + 1) +#define PITCH_DEC (RATE_DEC + 2) +#define PITCH_INC (PITCH_DEC + 1) +#define VOL_DEC (PITCH_DEC + 2) +#define VOL_INC (VOL_DEC + 1) +#define TONE_DEC (VOL_DEC + 2) +#define TONE_INC (TONE_DEC + 1) +#define PUNCT_DEC (TONE_DEC + 2) +#define PUNCT_INC (PUNCT_DEC + 1) +#define VOICE_DEC (PUNCT_DEC + 2) +#define VOICE_INC (VOICE_DEC + 1) #endif -- 2.1.4
[PATCH v2 1/2] staging: speakup: spk_types.h Comment modifications
Make modifications to comment style
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/spk_types.h | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/speakup/spk_types.h
b/drivers/staging/speakup/spk_types.h
index e8ff5d7..5552b48 100644
--- a/drivers/staging/speakup/spk_types.h
+++ b/drivers/staging/speakup/spk_types.h
@@ -1,16 +1,14 @@
#ifndef SPEAKUP_TYPES_H
#define SPEAKUP_TYPES_H
-/*
- * This file includes all of the typedefs and structs used in speakup.
- */
+/* This file includes all of the typedefs and structs used in speakup. */
#include
#include
#include
#include
#include /* for wait_queue */
-#include /* for __init */
+#include /* for __init */
#include
#include
#include
@@ -105,7 +103,7 @@ struct st_var_header {
enum var_id_t var_id;
enum var_type_t var_type;
void *p_val; /* ptr to programs variable to store value */
- void *data; /* ptr to the vars data */
+ void *data; /* ptr to the vars data */
};
struct num_var_t {
@@ -114,8 +112,8 @@ struct num_var_t {
int low;
int high;
short offset, multiplier; /* for fiddling rates etc. */
- char *out_str; /* if synth needs char representation of number */
- int value; /* current value */
+ char *out_str; /* if synth needs char representation of number */
+ int value; /* current value */
};
struct punc_var_t {
@@ -181,7 +179,7 @@ struct spk_synth {
struct attribute_group attributes;
};
-/**
+/*
* module_spk_synth() - Helper macro for registering a speakup driver
* @__spk_synth: spk_synth struct
* Helper macro for speakup drivers which do not do anything special in module
--
2.1.4
[PATCH v2 1/2] staging: speakup: spk_types.h 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/spk_types.h | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/speakup/spk_types.h
b/drivers/staging/speakup/spk_types.h
index e8ff5d7..5552b48 100644
--- a/drivers/staging/speakup/spk_types.h
+++ b/drivers/staging/speakup/spk_types.h
@@ -1,16 +1,14 @@
#ifndef SPEAKUP_TYPES_H
#define SPEAKUP_TYPES_H
-/*
- * This file includes all of the typedefs and structs used in speakup.
- */
+/* This file includes all of the typedefs and structs used in speakup. */
#include
#include
#include
#include
#include /* for wait_queue */
-#include /* for __init */
+#include /* for __init */
#include
#include
#include
@@ -105,7 +103,7 @@ struct st_var_header {
enum var_id_t var_id;
enum var_type_t var_type;
void *p_val; /* ptr to programs variable to store value */
- void *data; /* ptr to the vars data */
+ void *data; /* ptr to the vars data */
};
struct num_var_t {
@@ -114,8 +112,8 @@ struct num_var_t {
int low;
int high;
short offset, multiplier; /* for fiddling rates etc. */
- char *out_str; /* if synth needs char representation of number */
- int value; /* current value */
+ char *out_str; /* if synth needs char representation of number */
+ int value; /* current value */
};
struct punc_var_t {
@@ -181,7 +179,7 @@ struct spk_synth {
struct attribute_group attributes;
};
-/**
+/*
* module_spk_synth() - Helper macro for registering a speakup driver
* @__spk_synth: spk_synth struct
* Helper macro for speakup drivers which do not do anything special in module
--
2.1.4
[PATCH v2 0/2] staging: speakup: spk_types.h checkpatch modifications
Make Linux kernel style modifications to spk_types.h to include: Comment modifications Align parenthesis Walt Feasel (2): staging: speakup: spk_types.h Comment modifications staging: speakup: spk_types.h Align parenthesis drivers/staging/speakup/spk_types.h | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4
[PATCH v2 0/2] staging: speakup: spk_types.h checkpatch modifications
Make Linux kernel style modifications to spk_types.h to include: Comment modifications Align parenthesis Walt Feasel (2): staging: speakup: spk_types.h Comment modifications staging: speakup: spk_types.h Align parenthesis drivers/staging/speakup/spk_types.h | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4
[PATCH v2 2/2] staging: speakup: spk_types.h Align parenthesis
Make suggested checkpatch modification for
CHECK: Alignment should match open parenthesis
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
v2 makes changes to correct for email format patch submission
drivers/staging/speakup/spk_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/speakup/spk_types.h
b/drivers/staging/speakup/spk_types.h
index 5552b48..b07f6cc 100644
--- a/drivers/staging/speakup/spk_types.h
+++ b/drivers/staging/speakup/spk_types.h
@@ -167,7 +167,7 @@ struct spk_synth {
int (*probe)(struct spk_synth *synth);
void (*release)(void);
const char *(*synth_immediate)(struct spk_synth *synth,
- const char *buff);
+ const char *buff);
void (*catch_up)(struct spk_synth *synth);
void (*flush)(struct spk_synth *synth);
int (*is_alive)(struct spk_synth *synth);
--
2.1.4
[PATCH v2 2/2] staging: speakup: spk_types.h 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/spk_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/speakup/spk_types.h
b/drivers/staging/speakup/spk_types.h
index 5552b48..b07f6cc 100644
--- a/drivers/staging/speakup/spk_types.h
+++ b/drivers/staging/speakup/spk_types.h
@@ -167,7 +167,7 @@ struct spk_synth {
int (*probe)(struct spk_synth *synth);
void (*release)(void);
const char *(*synth_immediate)(struct spk_synth *synth,
- const char *buff);
+ const char *buff);
void (*catch_up)(struct spk_synth *synth);
void (*flush)(struct spk_synth *synth);
int (*is_alive)(struct spk_synth *synth);
--
2.1.4
[PATCH 2/5] staging: emxx_udc: emxx_udc.c Logical continuation
Make suggested checkpatch modification for
CHECK: Logical continuations should be on the
previous line
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
drivers/staging/emxx_udc/emxx_udc.c | 37 +++--
1 file changed, 15 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/emxx_udc/emxx_udc.c
b/drivers/staging/emxx_udc/emxx_udc.c
index 409761a..de8f065 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -926,8 +926,8 @@ static int _nbu2ss_epn_out_pio(
req->req.actual += result;
- if ((req->req.actual == req->req.length)
- || ((req->req.actual % ep->ep.maxpacket) != 0)) {
+ if ((req->req.actual == req->req.length) ||
+ ((req->req.actual % ep->ep.maxpacket) != 0)) {
result = 0;
}
@@ -953,9 +953,8 @@ static int _nbu2ss_epn_out_data(
iBufSize = min((req->req.length - req->req.actual), data_size);
- if ((ep->ep_type != USB_ENDPOINT_XFER_INT)
- && (req->req.dma != 0)
- && (iBufSize >= sizeof(u32))) {
+ if ((ep->ep_type != USB_ENDPOINT_XFER_INT) && (req->req.dma != 0) &&
+ (iBufSize >= sizeof(u32))) {
nret = _nbu2ss_out_dma(udc, req, num, iBufSize);
} else {
iBufSize = min_t(u32, iBufSize, ep->ep.maxpacket);
@@ -996,8 +995,8 @@ static int _nbu2ss_epn_out_transfer(
}
}
} else {
- if ((req->req.actual == req->req.length)
- || ((req->req.actual % ep->ep.maxpacket) != 0)) {
+ if ((req->req.actual == req->req.length) ||
+ ((req->req.actual % ep->ep.maxpacket) != 0)) {
result = 0;
}
}
@@ -1166,9 +1165,8 @@ static int _nbu2ss_epn_in_data(
num = ep->epnum - 1;
- if ((ep->ep_type != USB_ENDPOINT_XFER_INT)
- && (req->req.dma != 0)
- && (data_size >= sizeof(u32))) {
+ if ((ep->ep_type != USB_ENDPOINT_XFER_INT) && (req->req.dma != 0) &&
+ (data_size >= sizeof(u32))) {
nret = _nbu2ss_in_dma(udc, ep, req, num, data_size);
} else {
data_size = min_t(u32, data_size, ep->ep.maxpacket);
@@ -1577,8 +1575,7 @@ static int std_req_get_status(struct nbu2ss_udc *udc)
u8 ep_adrs;
int result = -EINVAL;
- if ((udc->ctrl.wValue != 0x)
- || (direction != USB_DIR_IN)) {
+ if ((udc->ctrl.wValue != 0x) || (direction != USB_DIR_IN)) {
return result;
}
@@ -1891,9 +1888,8 @@ static inline void _nbu2ss_ep0_int(struct nbu2ss_udc *udc)
break;
case EP0_OUT_STATUS_PAHSE:
- if ((status & STG_END_INT)
- || (status & SETUP_INT)
- || (status & EP0_OUT_NULL_INT)) {
+ if ((status & STG_END_INT) || (status & SETUP_INT) ||
+ (status & EP0_OUT_NULL_INT)) {
status &= ~(STG_END_INT
| EP0_OUT_INT
| EP0_OUT_NULL_INT);
@@ -2537,8 +2533,8 @@ static int nbu2ss_ep_enable(
}
ep_type = usb_endpoint_type(desc);
- if ((ep_type == USB_ENDPOINT_XFER_CONTROL)
- || (ep_type == USB_ENDPOINT_XFER_ISOC)) {
+ if ((ep_type == USB_ENDPOINT_XFER_CONTROL) ||
+ (ep_type == USB_ENDPOINT_XFER_ISOC)) {
pr_err(" *** %s, bat bmAttributes\n", __func__);
return -EINVAL;
}
@@ -2547,8 +2543,7 @@ static int nbu2ss_ep_enable(
if (udc->vbus_active == 0)
return -ESHUTDOWN;
- if ((!udc->driver)
- || (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
+ if ((!udc->driver) || (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
dev_err(ep->udc->dev, " *** %s, udc !!\n", __func__);
return -ESHUTDOWN;
}
@@ -2663,9 +2658,7 @@ static int nbu2ss_ep_queue(
}
req = container_of(_req, struct nbu2ss_req, req);
- if (unlikely
- (!_req->complete || !_req->buf
-|| !list_empty(>queue))) {
+ if (unlikely(!_req->complete || !_req->buf ||
!list_empty(>queue))) {
if (!_req->complete)
pr_err("udc: %s --- !_req->complete\n", __func__);
--
2.1.4
[PATCH 2/5] staging: emxx_udc: emxx_udc.c Logical continuation
Make suggested checkpatch modification for
CHECK: Logical continuations should be on the
previous line
Signed-off-by: Walt Feasel
---
drivers/staging/emxx_udc/emxx_udc.c | 37 +++--
1 file changed, 15 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/emxx_udc/emxx_udc.c
b/drivers/staging/emxx_udc/emxx_udc.c
index 409761a..de8f065 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -926,8 +926,8 @@ static int _nbu2ss_epn_out_pio(
req->req.actual += result;
- if ((req->req.actual == req->req.length)
- || ((req->req.actual % ep->ep.maxpacket) != 0)) {
+ if ((req->req.actual == req->req.length) ||
+ ((req->req.actual % ep->ep.maxpacket) != 0)) {
result = 0;
}
@@ -953,9 +953,8 @@ static int _nbu2ss_epn_out_data(
iBufSize = min((req->req.length - req->req.actual), data_size);
- if ((ep->ep_type != USB_ENDPOINT_XFER_INT)
- && (req->req.dma != 0)
- && (iBufSize >= sizeof(u32))) {
+ if ((ep->ep_type != USB_ENDPOINT_XFER_INT) && (req->req.dma != 0) &&
+ (iBufSize >= sizeof(u32))) {
nret = _nbu2ss_out_dma(udc, req, num, iBufSize);
} else {
iBufSize = min_t(u32, iBufSize, ep->ep.maxpacket);
@@ -996,8 +995,8 @@ static int _nbu2ss_epn_out_transfer(
}
}
} else {
- if ((req->req.actual == req->req.length)
- || ((req->req.actual % ep->ep.maxpacket) != 0)) {
+ if ((req->req.actual == req->req.length) ||
+ ((req->req.actual % ep->ep.maxpacket) != 0)) {
result = 0;
}
}
@@ -1166,9 +1165,8 @@ static int _nbu2ss_epn_in_data(
num = ep->epnum - 1;
- if ((ep->ep_type != USB_ENDPOINT_XFER_INT)
- && (req->req.dma != 0)
- && (data_size >= sizeof(u32))) {
+ if ((ep->ep_type != USB_ENDPOINT_XFER_INT) && (req->req.dma != 0) &&
+ (data_size >= sizeof(u32))) {
nret = _nbu2ss_in_dma(udc, ep, req, num, data_size);
} else {
data_size = min_t(u32, data_size, ep->ep.maxpacket);
@@ -1577,8 +1575,7 @@ static int std_req_get_status(struct nbu2ss_udc *udc)
u8 ep_adrs;
int result = -EINVAL;
- if ((udc->ctrl.wValue != 0x)
- || (direction != USB_DIR_IN)) {
+ if ((udc->ctrl.wValue != 0x) || (direction != USB_DIR_IN)) {
return result;
}
@@ -1891,9 +1888,8 @@ static inline void _nbu2ss_ep0_int(struct nbu2ss_udc *udc)
break;
case EP0_OUT_STATUS_PAHSE:
- if ((status & STG_END_INT)
- || (status & SETUP_INT)
- || (status & EP0_OUT_NULL_INT)) {
+ if ((status & STG_END_INT) || (status & SETUP_INT) ||
+ (status & EP0_OUT_NULL_INT)) {
status &= ~(STG_END_INT
| EP0_OUT_INT
| EP0_OUT_NULL_INT);
@@ -2537,8 +2533,8 @@ static int nbu2ss_ep_enable(
}
ep_type = usb_endpoint_type(desc);
- if ((ep_type == USB_ENDPOINT_XFER_CONTROL)
- || (ep_type == USB_ENDPOINT_XFER_ISOC)) {
+ if ((ep_type == USB_ENDPOINT_XFER_CONTROL) ||
+ (ep_type == USB_ENDPOINT_XFER_ISOC)) {
pr_err(" *** %s, bat bmAttributes\n", __func__);
return -EINVAL;
}
@@ -2547,8 +2543,7 @@ static int nbu2ss_ep_enable(
if (udc->vbus_active == 0)
return -ESHUTDOWN;
- if ((!udc->driver)
- || (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
+ if ((!udc->driver) || (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
dev_err(ep->udc->dev, " *** %s, udc !!\n", __func__);
return -ESHUTDOWN;
}
@@ -2663,9 +2658,7 @@ static int nbu2ss_ep_queue(
}
req = container_of(_req, struct nbu2ss_req, req);
- if (unlikely
- (!_req->complete || !_req->buf
-|| !list_empty(>queue))) {
+ if (unlikely(!_req->complete || !_req->buf ||
!list_empty(>queue))) {
if (!_req->complete)
pr_err("udc: %s --- !_req->complete\n", __func__);
--
2.1.4
[PATCH 5/5] staging: emxx_udc: emxx_udc.c Align parenthesis
Make suggested checkpatch modification for
CHECK: Alignment should match open parenthesis
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
drivers/staging/emxx_udc/emxx_udc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/emxx_udc/emxx_udc.c
b/drivers/staging/emxx_udc/emxx_udc.c
index 65672b5..3f42fa8 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -3284,8 +3284,8 @@ static int nbu2ss_drv_remove(struct platform_device *pdev)
for (i = 0; i < NUM_ENDPOINTS; i++) {
ep = >ep[i];
if (ep->virt_buf)
- dma_free_coherent(NULL, PAGE_SIZE,
- (void *)ep->virt_buf, ep->phys_buf);
+ dma_free_coherent(NULL, PAGE_SIZE, (void *)ep->virt_buf,
+ ep->phys_buf);
}
/* Interrupt Handler - Release */
--
2.1.4
[PATCH 5/5] staging: emxx_udc: emxx_udc.c Align parenthesis
Make suggested checkpatch modification for
CHECK: Alignment should match open parenthesis
Signed-off-by: Walt Feasel
---
drivers/staging/emxx_udc/emxx_udc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/emxx_udc/emxx_udc.c
b/drivers/staging/emxx_udc/emxx_udc.c
index 65672b5..3f42fa8 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -3284,8 +3284,8 @@ static int nbu2ss_drv_remove(struct platform_device *pdev)
for (i = 0; i < NUM_ENDPOINTS; i++) {
ep = >ep[i];
if (ep->virt_buf)
- dma_free_coherent(NULL, PAGE_SIZE,
- (void *)ep->virt_buf, ep->phys_buf);
+ dma_free_coherent(NULL, PAGE_SIZE, (void *)ep->virt_buf,
+ ep->phys_buf);
}
/* Interrupt Handler - Release */
--
2.1.4
[PATCH 4/5] staging: emxx_udc: emxx_udc.c Spaces preferred around operators
Make suggested checkpatch modification for
CHECK: spaces preferred around that '|'
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
drivers/staging/emxx_udc/emxx_udc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/emxx_udc/emxx_udc.c
b/drivers/staging/emxx_udc/emxx_udc.c
index 3a29f38..65672b5 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -262,7 +262,7 @@ static int _nbu2ss_ep_init(struct nbu2ss_udc *udc, struct
nbu2ss_ep *ep)
}
_nbu2ss_bitset(>p_regs->EP_REGS[num].EP_CONTROL, data);
- _nbu2ss_endpoint_toggle_reset(udc, (ep->epnum|ep->direct));
+ _nbu2ss_endpoint_toggle_reset(udc, (ep->epnum | ep->direct));
if (ep->direct == USB_DIR_OUT) {
/*-*/
--
2.1.4
[PATCH 4/5] staging: emxx_udc: emxx_udc.c Spaces preferred around operators
Make suggested checkpatch modification for
CHECK: spaces preferred around that '|'
Signed-off-by: Walt Feasel
---
drivers/staging/emxx_udc/emxx_udc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/emxx_udc/emxx_udc.c
b/drivers/staging/emxx_udc/emxx_udc.c
index 3a29f38..65672b5 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -262,7 +262,7 @@ static int _nbu2ss_ep_init(struct nbu2ss_udc *udc, struct
nbu2ss_ep *ep)
}
_nbu2ss_bitset(>p_regs->EP_REGS[num].EP_CONTROL, data);
- _nbu2ss_endpoint_toggle_reset(udc, (ep->epnum|ep->direct));
+ _nbu2ss_endpoint_toggle_reset(udc, (ep->epnum | ep->direct));
if (ep->direct == USB_DIR_OUT) {
/*-*/
--
2.1.4
[PATCH 3/5] staging: emxx_udc: emxx_udc.c {} Single statement blocks
Make suggested checkpatch modification for
WARNING: braces {} are not necessary for single
statement blocks
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
drivers/staging/emxx_udc/emxx_udc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/emxx_udc/emxx_udc.c
b/drivers/staging/emxx_udc/emxx_udc.c
index de8f065..3a29f38 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -1575,9 +1575,8 @@ static int std_req_get_status(struct nbu2ss_udc *udc)
u8 ep_adrs;
int result = -EINVAL;
- if ((udc->ctrl.wValue != 0x) || (direction != USB_DIR_IN)) {
+ if ((udc->ctrl.wValue != 0x) || (direction != USB_DIR_IN))
return result;
- }
length = min_t(u16, udc->ctrl.wLength, sizeof(status_data));
--
2.1.4
[PATCH 0/5] staging: emxx_udc: emxx_udc.c checkpatch modifications
Make Linux kernel style modifications for emxx_udc.c to include:
Blank lines after {
Logical continuation
Single statement blocks
Spaces preferred around operators
Align parenthesis
Walt Feasel (5):
staging: emxx_udc: emxx_udc.c Blank lines after {
staging: emxx_udc: emxx_udc.c Logical continuation
staging: emxx_udc: emxx_udc.c {} Single statement blocks
staging: emxx_udc: emxx_udc.c Spaces preferred around operators
staging: emxx_udc: emxx_udc.c Align parenthesis
drivers/staging/emxx_udc/emxx_udc.c | 57 -
1 file changed, 18 insertions(+), 39 deletions(-)
--
2.1.4
[PATCH 1/5] staging: emxx_udc: emxx_udc.c Blank lines after {
Make suggested checkpatch modification for
CHECK: Blank lines aren't necessary after an
open brace '{'
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
drivers/staging/emxx_udc/emxx_udc.c | 13 -
1 file changed, 13 deletions(-)
diff --git a/drivers/staging/emxx_udc/emxx_udc.c
b/drivers/staging/emxx_udc/emxx_udc.c
index 31f4206..409761a 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -153,7 +153,6 @@ static void _nbu2ss_ep0_complete(struct usb_ep *_ep, struct
usb_request *_req)
udc = (struct nbu2ss_udc *)_req->context;
p_ctrl = >ctrl;
if ((p_ctrl->bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD) {
-
if (p_ctrl->bRequest == USB_REQ_SET_FEATURE) {
/*-*/
/* SET_FEATURE */
@@ -753,7 +752,6 @@ static int _nbu2ss_ep0_out_transfer(
/* Receive data confirmation */
iRecvLength = _nbu2ss_readl(>p_regs->EP0_LENGTH) & EP0_LDATA;
if (iRecvLength != 0) {
-
fRcvZero = 0;
iRemainSize = req->req.length - req->req.actual;
@@ -930,7 +928,6 @@ static int _nbu2ss_epn_out_pio(
if ((req->req.actual == req->req.length)
|| ((req->req.actual % ep->ep.maxpacket) != 0)) {
-
result = 0;
}
@@ -1001,7 +998,6 @@ static int _nbu2ss_epn_out_transfer(
} else {
if ((req->req.actual == req->req.length)
|| ((req->req.actual % ep->ep.maxpacket) != 0)) {
-
result = 0;
}
}
@@ -1557,7 +1553,6 @@ static void _nbu2ss_epn_set_stall(
for (limit_cnt = 0
; limit_cnt < IN_DATA_EMPTY_COUNT
; limit_cnt++) {
-
regdata = _nbu2ss_readl(
>EP_REGS[ep->epnum - 1].EP_STATUS);
@@ -1584,7 +1579,6 @@ static int std_req_get_status(struct nbu2ss_udc *udc)
if ((udc->ctrl.wValue != 0x)
|| (direction != USB_DIR_IN)) {
-
return result;
}
@@ -1982,7 +1976,6 @@ static inline void _nbu2ss_epn_in_int(
} else {
if (req->zero && ((req->req.actual % ep->ep.maxpacket) == 0)) {
-
status =
_nbu2ss_readl(>EP_REGS[ep->epnum - 1].EP_STATUS);
@@ -2330,7 +2323,6 @@ static inline void _nbu2ss_check_vbus(struct nbu2ss_udc
*udc)
/* VBUS ON Check*/
reg_dt = gpio_get_value(VBUS_VALUE);
if (reg_dt == 0) {
-
udc->linux_suspended = 0;
_nbu2ss_reset_controller(udc);
@@ -2502,7 +2494,6 @@ static irqreturn_t _nbu2ss_udc_irq(int irq, void *_udc)
int_bit = status >> 8;
for (epnum = 0; epnum < NUM_ENDPOINTS; epnum++) {
-
if (0x01 & int_bit)
_nbu2ss_ep_int(udc, epnum);
@@ -2548,7 +2539,6 @@ static int nbu2ss_ep_enable(
ep_type = usb_endpoint_type(desc);
if ((ep_type == USB_ENDPOINT_XFER_CONTROL)
|| (ep_type == USB_ENDPOINT_XFER_ISOC)) {
-
pr_err(" *** %s, bat bmAttributes\n", __func__);
return -EINVAL;
}
@@ -2559,7 +2549,6 @@ static int nbu2ss_ep_enable(
if ((!udc->driver)
|| (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
-
dev_err(ep->udc->dev, " *** %s, udc !!\n", __func__);
return -ESHUTDOWN;
}
@@ -2677,7 +2666,6 @@ static int nbu2ss_ep_queue(
if (unlikely
(!_req->complete || !_req->buf
|| !list_empty(>queue))) {
-
if (!_req->complete)
pr_err("udc: %s --- !_req->complete\n", __func__);
@@ -2736,7 +2724,6 @@ static int nbu2ss_ep_queue(
list_add_tail(>queue, >queue);
if (bflag && !ep->stalled) {
-
result = _nbu2ss_start_transfer(udc, ep, req, FALSE);
if (result < 0) {
dev_err(udc->dev, " *** %s, result = %d\n", __func__,
--
2.1.4
[PATCH 3/5] staging: emxx_udc: emxx_udc.c {} Single statement blocks
Make suggested checkpatch modification for
WARNING: braces {} are not necessary for single
statement blocks
Signed-off-by: Walt Feasel
---
drivers/staging/emxx_udc/emxx_udc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/emxx_udc/emxx_udc.c
b/drivers/staging/emxx_udc/emxx_udc.c
index de8f065..3a29f38 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -1575,9 +1575,8 @@ static int std_req_get_status(struct nbu2ss_udc *udc)
u8 ep_adrs;
int result = -EINVAL;
- if ((udc->ctrl.wValue != 0x) || (direction != USB_DIR_IN)) {
+ if ((udc->ctrl.wValue != 0x) || (direction != USB_DIR_IN))
return result;
- }
length = min_t(u16, udc->ctrl.wLength, sizeof(status_data));
--
2.1.4
[PATCH 0/5] staging: emxx_udc: emxx_udc.c checkpatch modifications
Make Linux kernel style modifications for emxx_udc.c to include:
Blank lines after {
Logical continuation
Single statement blocks
Spaces preferred around operators
Align parenthesis
Walt Feasel (5):
staging: emxx_udc: emxx_udc.c Blank lines after {
staging: emxx_udc: emxx_udc.c Logical continuation
staging: emxx_udc: emxx_udc.c {} Single statement blocks
staging: emxx_udc: emxx_udc.c Spaces preferred around operators
staging: emxx_udc: emxx_udc.c Align parenthesis
drivers/staging/emxx_udc/emxx_udc.c | 57 -
1 file changed, 18 insertions(+), 39 deletions(-)
--
2.1.4
[PATCH 1/5] staging: emxx_udc: emxx_udc.c Blank lines after {
Make suggested checkpatch modification for
CHECK: Blank lines aren't necessary after an
open brace '{'
Signed-off-by: Walt Feasel
---
drivers/staging/emxx_udc/emxx_udc.c | 13 -
1 file changed, 13 deletions(-)
diff --git a/drivers/staging/emxx_udc/emxx_udc.c
b/drivers/staging/emxx_udc/emxx_udc.c
index 31f4206..409761a 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -153,7 +153,6 @@ static void _nbu2ss_ep0_complete(struct usb_ep *_ep, struct
usb_request *_req)
udc = (struct nbu2ss_udc *)_req->context;
p_ctrl = >ctrl;
if ((p_ctrl->bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD) {
-
if (p_ctrl->bRequest == USB_REQ_SET_FEATURE) {
/*-*/
/* SET_FEATURE */
@@ -753,7 +752,6 @@ static int _nbu2ss_ep0_out_transfer(
/* Receive data confirmation */
iRecvLength = _nbu2ss_readl(>p_regs->EP0_LENGTH) & EP0_LDATA;
if (iRecvLength != 0) {
-
fRcvZero = 0;
iRemainSize = req->req.length - req->req.actual;
@@ -930,7 +928,6 @@ static int _nbu2ss_epn_out_pio(
if ((req->req.actual == req->req.length)
|| ((req->req.actual % ep->ep.maxpacket) != 0)) {
-
result = 0;
}
@@ -1001,7 +998,6 @@ static int _nbu2ss_epn_out_transfer(
} else {
if ((req->req.actual == req->req.length)
|| ((req->req.actual % ep->ep.maxpacket) != 0)) {
-
result = 0;
}
}
@@ -1557,7 +1553,6 @@ static void _nbu2ss_epn_set_stall(
for (limit_cnt = 0
; limit_cnt < IN_DATA_EMPTY_COUNT
; limit_cnt++) {
-
regdata = _nbu2ss_readl(
>EP_REGS[ep->epnum - 1].EP_STATUS);
@@ -1584,7 +1579,6 @@ static int std_req_get_status(struct nbu2ss_udc *udc)
if ((udc->ctrl.wValue != 0x)
|| (direction != USB_DIR_IN)) {
-
return result;
}
@@ -1982,7 +1976,6 @@ static inline void _nbu2ss_epn_in_int(
} else {
if (req->zero && ((req->req.actual % ep->ep.maxpacket) == 0)) {
-
status =
_nbu2ss_readl(>EP_REGS[ep->epnum - 1].EP_STATUS);
@@ -2330,7 +2323,6 @@ static inline void _nbu2ss_check_vbus(struct nbu2ss_udc
*udc)
/* VBUS ON Check*/
reg_dt = gpio_get_value(VBUS_VALUE);
if (reg_dt == 0) {
-
udc->linux_suspended = 0;
_nbu2ss_reset_controller(udc);
@@ -2502,7 +2494,6 @@ static irqreturn_t _nbu2ss_udc_irq(int irq, void *_udc)
int_bit = status >> 8;
for (epnum = 0; epnum < NUM_ENDPOINTS; epnum++) {
-
if (0x01 & int_bit)
_nbu2ss_ep_int(udc, epnum);
@@ -2548,7 +2539,6 @@ static int nbu2ss_ep_enable(
ep_type = usb_endpoint_type(desc);
if ((ep_type == USB_ENDPOINT_XFER_CONTROL)
|| (ep_type == USB_ENDPOINT_XFER_ISOC)) {
-
pr_err(" *** %s, bat bmAttributes\n", __func__);
return -EINVAL;
}
@@ -2559,7 +2549,6 @@ static int nbu2ss_ep_enable(
if ((!udc->driver)
|| (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
-
dev_err(ep->udc->dev, " *** %s, udc !!\n", __func__);
return -ESHUTDOWN;
}
@@ -2677,7 +2666,6 @@ static int nbu2ss_ep_queue(
if (unlikely
(!_req->complete || !_req->buf
|| !list_empty(>queue))) {
-
if (!_req->complete)
pr_err("udc: %s --- !_req->complete\n", __func__);
@@ -2736,7 +2724,6 @@ static int nbu2ss_ep_queue(
list_add_tail(>queue, >queue);
if (bflag && !ep->stalled) {
-
result = _nbu2ss_start_transfer(udc, ep, req, FALSE);
if (result < 0) {
dev_err(udc->dev, " *** %s, result = %d\n", __func__,
--
2.1.4
[PATCH v3] staging: skein: threefish_block.c Remove blank lines
Make suggested checkpatch modification for CHECK: Please don't use multiple blank lines Acked-by: Jason Cooper <ja...@lakedaemon.net Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v3 adds previously missed ack and --to email for Jason 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
[PATCH v3] staging: skein: threefish_block.c Remove blank lines
Make suggested checkpatch modification for CHECK: Please don't use multiple blank lines Acked-by: Jason Cooper --- v3 adds previously missed ack and --to email for Jason 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
Re: Possible corrupt file or patch
On Sun, Nov 20, 2016 at 10:50:49AM +0100, Greg KH wrote: > On Sun, Nov 20, 2016 at 01:41:46AM -0500, Walt Feasel wrote: > > 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 <waltfea...@gmail.com> > > --- > > 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 */ > > If you look close, there is a tab character after the "#define" and > before the "CTRL" on all of these lines, not a space. Odds are that > nano and gedit do not show it. If you use something like emacs or vim, > there are modes in which you can see control characters like this. > > I recommend getting rid of all of the tab characters right after > "#define" as this is just a mess and causes confusion as you are seeing. > > thanks, > > greg k-h > Greg, Thanks again! I saw them in vim! Setting whitespace in nano is not done by default I guess but have it set now. Walt
Re: Possible corrupt file or patch
On Sun, Nov 20, 2016 at 10:50:49AM +0100, Greg KH wrote: > On Sun, Nov 20, 2016 at 01:41:46AM -0500, Walt Feasel wrote: > > 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 */ > > If you look close, there is a tab character after the "#define" and > before the "CTRL" on all of these lines, not a space. Odds are that > nano and gedit do not show it. If you use something like emacs or vim, > there are modes in which you can see control characters like this. > > I recommend getting rid of all of the tab characters right after > "#define" as this is just a mess and causes confusion as you are seeing. > > thanks, > > greg k-h > Greg, Thanks again! I saw them in vim! Setting whitespace in nano is not done by default I guess but have it set now. Walt
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 <waltfea...@gmail.com> --- 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
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
[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 <waltfea...@gmail.com>
---
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(_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
[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(_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
[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 <waltfea...@gmail.com> --- 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
[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 <waltfea...@gmail.com>
---
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, >attributes) < 0)
+ if (synth->attributes.name && sysfs_create_group(speakup_kobj,
+>attributes) <
0)
return -ENOMEM;
synth_flags = synth->flags;
wake_up_interruptible_all(_event);
--
2.1.4
[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 <waltfea...@gmail.com>
---
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
[PATCH v2 4/5] staging: speakup: synth.c Comment modifications
Make modifications to comment style Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- 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
[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
[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, >attributes) < 0)
+ if (synth->attributes.name && sysfs_create_group(speakup_kobj,
+>attributes) <
0)
return -ENOMEM;
synth_flags = synth->flags;
wake_up_interruptible_all(_event);
--
2.1.4
[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
[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
[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 <waltfea...@gmail.com>
---
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(_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
[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(_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
[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
[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
[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 <waltfea...@gmail.com> --- 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(_event, , - TASK_INTERRUPTIBLE); + TASK_INTERRUPTIBLE); should_break = kthread_should_stop() || our_sound.active || (synth && synth->catch_up && synth->alive && -- 2.1.4
[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(_event, , - TASK_INTERRUPTIBLE); + TASK_INTERRUPTIBLE); should_break = kthread_should_stop() || our_sound.active || (synth && synth->catch_up && synth->alive && -- 2.1.4
[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
[PATCH v2 1/2] staging: speakup: thread.c Comment modifications
Make comment style modifications
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
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
[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
[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
[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 <waltfea...@gmail.com> --- 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
[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
[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 <waltfea...@gmail.com>
---
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
[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
[PATCH v2 3/3] staging: speakup: TODO Correct email
Make email correction for k...@reisers.ca Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- 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
[PATCH v2 1/3] staging: speakup: varhandlers.c Comment style modifications
Make modifications to comment style Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- 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
[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
[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
[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
[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
[PATCH v2 2/2] staging: dgnc: digi.h Spelling correction
Make spelling correction for 'regular'
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
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 /* !
[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 /* !
[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
[PATCH v2 1/2] staging: dgnc: digi.h Comment style modifications
Make modifications to comment style
Signed-off-by: Walt Feasel <waltfea...@gmail.com>
---
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.
- /
[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
[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
[PATCH v3 4/4] staging: dgnc: dgnc_tty.c Spelling corrections
Make spelling corrections for 'transitions' and 'satisfy' Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- 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_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
[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_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
