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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 1/5] staging: speakup: synth.c Spaces around operators
Make suggested checkpatch modification for CHECK: spaces preferred around that '|,+,-,/' Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/5] staging: speakup: synth.c Blank line before }
Make suggested checkpatch modification for CHECK: Blank lines aren't necessary before a close brace '}' Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/5] staging: speakup: synth.c Spaces around operators
Make suggested checkpatch modification for CHECK: spaces preferred around that '+,|,-,/' Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/5] staging: speakup: synth.c checkpatch modifications
Make Linux kernel coding style modifications for XGI_main_26.c to include: Spaces around operators Blank lines before } Logical continuation Comment modifications Align on parenthesis Walt Feasel (5): staging: speakup: synth.c Spaces around operators staging: speakup: synth.c Blank line before } staging: speakup: synth.c Logical continuation staging: speakup: synth.c Comment modifications staging: speakup: synth.c Align parenthesis drivers/staging/speakup/synth.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 5/5] staging: speakup: synth.c Align parenthesis
Make suggested checkpatch modification for CHECK: Alignment should match open parenthesis Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 3/5] staging: speakup: synth.c Logical continuation
Make suggested checkpatch modification for CHECK: Logical continuations should be on the previous line Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 4/5] staging: speakup: synth.c Comment modifications
Make modifications to comment style Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/2] staging: speakup: thread.c align on parenthesis
Make suggested checkpatch modification for CHECK: Alignment should match open parenthesis Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/2] staging: speakup: thread.c Comment modifications
Make comment style modifications Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/2] staging: speakup: thread.c checkpatch modifications
Make Linux kernel style modifications for speakup to include comment style modifications align parenthesis Walt Feasel (2): staging: speakup: thread.c Comment modifications staging: speakup: thread.c align on parenthesis drivers/staging/speakup/thread.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: skein: threefish_block.c Remove blank lines
Make suggested checkpatch modification for CHECK: Please don't use multiple blank lines Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/3] staging: speakup: varhandlers.c Comment style modifications
Make modifications to comment style Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/3] staging: speakup: checkpatch modifications
Make Linux kernel style modifications for speakup to include: Comment style modifications Align parenthesis Correct email in TODO Walt Feasel (3): staging: speakup: varhandlers.c Comment style modifications staging: speakup: varhandlers.c Align parenthesis staging: speakup: TODO Correct email drivers/staging/speakup/TODO | 2 +- drivers/staging/speakup/varhandlers.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 3/3] staging: speakup: TODO Correct email
Make email correction for k...@reisers.ca Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/3] staging: speakup: varhandlers.c Align parenthesis
Make suggested checkpatch modification for CHECK: Alignment should match open parenthesis Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/2] staging: dgnc: digi.h Spelling correction
Make spelling correction for 'regular' Signed-off-by: Walt Feasel <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 /* !http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/2] staging: dgnc: digi.h Comment style modifications
Make modifications to comment style Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 1/4] staging: dgnc: dgnc_tty.c Space preferred around
Make suggested checkpatch modification for CHECK: spaces preferred around that '|' Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v3 makes changes to correct for email format patch submission drivers/staging/dgnc/dgnc_tty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index 8dc7c62..52be33f 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -2580,7 +2580,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, wake_up_interruptible(>ch_tun.un_flags_wait); } - if (ch->ch_pun.un_flags & (UN_LOW|UN_EMPTY)) { + if (ch->ch_pun.un_flags & (UN_LOW | UN_EMPTY)) { ch->ch_pun.un_flags &= ~(UN_LOW | UN_EMPTY); wake_up_interruptible(>ch_pun.un_flags_wait); -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 4/4] staging: dgnc: dgnc_tty.c Spelling corrections
Make spelling corrections for 'transitions' and 'satisfy' Signed-off-by: Walt Feasel <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 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 2/4] staging: dgnc: dgnc_tty.c Align on parenthesis
Make suggested checkpatch modification for CHECK: Alignment should match open parenthesis Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v3 makes changes to correct for email format patch submission drivers/staging/dgnc/dgnc_tty.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index 52be33f..e4e596a 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -1003,9 +1003,8 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file) * touched safely, the close routine will signal the * ch_flags_wait to wake us back up. */ - rc = wait_event_interruptible(ch->ch_flags_wait, - (((ch->ch_tun.un_flags | ch->ch_pun.un_flags) & - UN_CLOSING) == 0)); + rc = wait_event_interruptible(ch->ch_flags_wait, (((ch->ch_tun.un_flags | + ch->ch_pun.un_flags) & UN_CLOSING) == 0)); /* If ret is non-zero, user ctrl-c'ed us */ if (rc) @@ -1228,12 +1227,12 @@ static int dgnc_block_til_ready(struct tty_struct *tty, * from the current value. */ if (sleep_on_un_flags) - retval = wait_event_interruptible(un->un_flags_wait, - (old_flags != (ch->ch_tun.un_flags | - ch->ch_pun.un_flags))); + retval = wait_event_interruptible + (un->un_flags_wait, (old_flags != (ch->ch_tun.un_flags | + ch->ch_pun.un_flags))); else retval = wait_event_interruptible(ch->ch_flags_wait, - (old_flags != ch->ch_flags)); + (old_flags != ch->ch_flags)); /* * We got woken up for some reason. -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 3/4] staging: dgnc: dgnc_tty.c comment style modifications
Make modifications to comment style Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v3 makes changes to correct for email format patch submission drivers/staging/dgnc/dgnc_tty.c | 229 +++- 1 file changed, 86 insertions(+), 143 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index e4e596a..6a11ddf 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -13,13 +13,9 @@ * PURPOSE. See the GNU General Public License for more details. */ -/ - * +/* * This file implements the tty driver functionality for the * Neo and ClassicBoard PCI based product lines. - * - - * */ #include @@ -42,19 +38,18 @@ #include "dgnc_sysfs.h" #include "dgnc_utils.h" -/* - * Default transparent print information. - */ +/* Default transparent print information. */ + static const struct digi_t dgnc_digi_init = { - .digi_flags = DIGI_COOK, /* Flags*/ - .digi_maxcps = 100,/* Max CPS */ - .digi_maxchar = 50, /* Max chars in print queue */ - .digi_bufsize = 100,/* Printer buffer size */ - .digi_onlen = 4, /* size of printer on string*/ - .digi_offlen = 4, /* size of printer off string */ - .digi_onstr = "\033[5i", /* ANSI printer on string ] */ - .digi_offstr = "\033[4i", /* ANSI printer off string ]*/ - .digi_term ="ansi" /* default terminal type*/ + .digi_flags = DIGI_COOK, /* Flags */ + .digi_maxcps = 100,/* Max CPS */ + .digi_maxchar = 50, /* Max chars in print queue */ + .digi_bufsize = 100,/* Printer buffer size */ + .digi_onlen = 4, /* size of printer on string */ + .digi_offlen = 4, /* size of printer off string */ + .digi_onstr = "\033[5i", /* ANSI printer on string ] */ + .digi_offstr = "\033[4i", /* ANSI printer off string ] */ + .digi_term ="ansi" /* default terminal type */ }; /* @@ -132,11 +127,7 @@ static const struct tty_operations dgnc_tty_ops = { .send_xchar = dgnc_tty_send_xchar }; -/ - * - * TTY Initialization/Cleanup Functions - * - / +/* TTY Initialization/Cleanup Functions */ /* * dgnc_tty_register() @@ -255,9 +246,7 @@ int dgnc_tty_init(struct dgnc_board *brd) if (!brd) return -ENXIO; - /* -* Initialize board structure elements. -*/ + /* Initialize board structure elements. */ vaddr = brd->re_map_membase; @@ -396,9 +385,9 @@ static void dgnc_wmove(struct channel_t *ch, char *buf, uint n) } if (n > 0) { - /* -* Move rest of data. -*/ + + /* Move rest of data. */ + remain = n; memcpy(ch->ch_wqueue + head, buf, remain); head += remain; @@ -468,9 +457,8 @@ void dgnc_input(struct channel_t *ch) goto exit_unlock; } - /* -* If we are throttled, simply don't read any data. -*/ + /* If we are throttled, simply don't read any data. */ + if (ch->ch_flags & CH_FORCED_STOPI) goto exit_unlock; @@ -583,10 +571,10 @@ void dgnc_input(struct channel_t *ch) tty_ldisc_deref(ld); } -/ +/* * Determines when CARRIER changes state and takes appropriate * action. - / + */ void dgnc_carrier(struct channel_t *ch) { int virt_carrier = 0; @@ -604,9 +592,8 @@ void dgnc_carrier(struct channel_t *ch) if (ch->ch_c_cflag & CLOCAL) virt_carrier = 1; - /* -* Test for a VIRTUAL carrier transition to HIGH. -*/ + /* Test for a VIRTUAL carrier transition to HIGH. */ + if (((ch->ch_flags & CH_FCAR) == 0) && (virt_carrier == 1)) { /* * When carrier rises, wake any threads waiting @@ -617,9 +604,8 @@ void dgnc_carrier(struct channel_t *ch) wake_up_interruptible(>ch_flags_wait); } - /* -* Test for a PHYSICAL carrier transition to HIGH. -*/ + /* Test for a PHYSICAL carrier transition to HIGH. */ + if (((c
[PATCH v3 0/4] staging: dgnc: dgnc_tty.c checkpatch modifications
Linux kernel coding style modifications for dgnc_tty.c to include: Space perferred around Align on parenthesis Comment style modifications Spelling corrections Walt Feasel (4): staging: dgnc: dgnc_tty.c Space preferred around staging: dgnc: dgnc_tty.c Align on parenthesis staging: dgnc: dgnc_tty.c comment style modifications staging: dgnc: dgnc_tty.c Spelling corrections drivers/staging/dgnc/dgnc_tty.c | 250 +++- 1 file changed, 96 insertions(+), 154 deletions(-) -- v2 resubmitted without behaviour v3 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/2] staging: dgnc: dgnc_sysfs.c Delete blank line
Make modification to remove extra blank line Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/dgnc/dgnc_sysfs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/dgnc/dgnc_sysfs.c b/drivers/staging/dgnc/dgnc_sysfs.c index 6e8c53b..d41517c 100644 --- a/drivers/staging/dgnc/dgnc_sysfs.c +++ b/drivers/staging/dgnc/dgnc_sysfs.c @@ -701,4 +701,3 @@ void dgnc_remove_tty_sysfs(struct device *c) { sysfs_remove_group(>kobj, _tty_attribute_group); } - -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/2] staging: dgnc: dgnc_sysfs.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/dgnc/dgnc_sysfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/dgnc/dgnc_sysfs.c b/drivers/staging/dgnc/dgnc_sysfs.c index 290bf6e..6e8c53b 100644 --- a/drivers/staging/dgnc/dgnc_sysfs.c +++ b/drivers/staging/dgnc/dgnc_sysfs.c @@ -334,7 +334,8 @@ static ssize_t ports_txcount_show(struct device *p, } static DEVICE_ATTR_RO(ports_txcount); -/* this function creates the sys files that will export each signal status +/* + * this function creates the sys files that will export each signal status * to sysfs each value will be put in a separate filename */ void dgnc_create_ports_sysfiles(struct dgnc_board *bd) -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/2] staging: dgnc: dgnc_sysfs.c checkpatch modifications
Make Linux kernel coding style modifications for dgnc_sysfs.c to include: Comment style modifications Remove blank line Walt Feasel (2): staging: dgnc: dgnc_sysfs.c Comment style modifications staging: dgnc: dgnc_sysfs.c Delete blank line drivers/staging/dgnc/dgnc_sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/2] staging: dgnc: dgnc_neo.h Comment style modifications
Make modifications for comment style Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- drivers/staging/dgnc/dgnc_neo.h | 24 +++- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_neo.h b/drivers/staging/dgnc/dgnc_neo.h index 97f0386..1aa9325 100644 --- a/drivers/staging/dgnc/dgnc_neo.h +++ b/drivers/staging/dgnc/dgnc_neo.h @@ -18,14 +18,13 @@ #include "dgnc_driver.h" -/ - * Per channel/port NEO UART structure * - - * Base Structure Entries Usage Meanings to Host * - * * - * W = read write R = read only * - * U = Unused. * - / +/* + * Per channel/port NEO UART structure + * Base Structure Entries Usage Meanings to Host + * + * W = read write R = read only + * U = Unused. + */ struct neo_uart_struct { u8 txrx;/* WR RHR/THR - Holding Reg */ @@ -48,9 +47,9 @@ struct neo_uart_struct { u8 xonchar2;/* WR XON 2 - XOn Character 2 Reg */ u8 reserved1[0x2ff - 0x200]; /* U Reserved by Exar */ - u8 txrxburst[64]; /* RW 64 bytes of RX/TX FIFO Data */ + u8 txrxburst[64];/* RW 64 bytes of RX/TX FIFO Data */ u8 reserved2[0x37f - 0x340]; /* U Reserved by Exar */ - u8 rxburst_with_errors[64]; /* R 64 bytes of RX FIFO Data + LSR */ + u8 rxburst_with_errors[64]; /* R 64 bytes of RX FIFO Data + LSR */ }; /* Where to read the extended interrupt register (32bits instead of 8bits) */ @@ -152,9 +151,8 @@ struct neo_uart_struct { #define UART_17158_IER_RTSDTR 0x40/* Output Interrupt Enable */ #define UART_17158_IER_CTSDSR 0x80/* Input Interrupt Enable */ -/* - * Our Global Variables - */ +/* Our Global Variables */ + extern struct board_ops dgnc_neo_ops; #endif -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/2] staging: dgnc: dgnc_neo.h Spelling correction
Make spelling correction for 'control' Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- drivers/staging/dgnc/dgnc_neo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/dgnc/dgnc_neo.h b/drivers/staging/dgnc/dgnc_neo.h index 1aa9325..77ecd9b 100644 --- a/drivers/staging/dgnc/dgnc_neo.h +++ b/drivers/staging/dgnc/dgnc_neo.h @@ -137,7 +137,7 @@ struct neo_uart_struct { #define UART_17158_EFR_IXON0x2 /* Receiver compares Xon1/Xoff1 */ #define UART_17158_EFR_IXOFF 0x8 /* Transmit Xon1/Xoff1 */ #define UART_17158_EFR_RTSDTR 0x40/* Auto RTS/DTR Flow Control Enable */ -#define UART_17158_EFR_CTSDSR 0x80/* Auto CTS/DSR Flow COntrol Enable */ +#define UART_17158_EFR_CTSDSR 0x80/* Auto CTS/DSR Flow Control Enable */ #define UART_17158_XOFF_DETECT 0x1 /* Indicates whether chip saw an * incoming XOFF char -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/2] staging: dgnc: dgnc_neo.h checkpatch modifications
Make Linux kernel coding style modifications for dgnc_neo.h to include: Spelling correction Comment style modifications Walt Feasel (2): staging: dgnc: dgnc_neo.h Comment style modifications staging: dgnc: dgnc_neo.h Spelling correction drivers/staging/dgnc/dgnc_neo.h | 26 -- 1 file changed, 12 insertions(+), 14 deletions(-) -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: dgnc: dgnc_neo.c Comment style modifications
Make modifications for comment style Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/dgnc/dgnc_neo.c | 111 +++- 1 file changed, 54 insertions(+), 57 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_neo.c b/drivers/staging/dgnc/dgnc_neo.c index 5becb37..3eefefe 100644 --- a/drivers/staging/dgnc/dgnc_neo.c +++ b/drivers/staging/dgnc/dgnc_neo.c @@ -107,7 +107,8 @@ static inline void neo_set_cts_flow_control(struct channel_t *ch) /* Turn off auto Xon flow control */ efr &= ~UART_17158_EFR_IXON; - /* Why? Because Exar's spec says we have to zero it + /* +* Why? Because Exar's spec says we have to zero it * out before setting it */ writeb(0, >ch_neo_uart->efr); @@ -145,7 +146,8 @@ static inline void neo_set_rts_flow_control(struct channel_t *ch) ier &= ~UART_17158_IER_XOFF; efr &= ~UART_17158_EFR_IXOFF; - /* Why? Because Exar's spec says we have to zero it + /* +* Why? Because Exar's spec says we have to zero it * out before setting it */ writeb(0, >ch_neo_uart->efr); @@ -185,7 +187,8 @@ static inline void neo_set_ixon_flow_control(struct channel_t *ch) /* Turn on auto Xon flow control */ efr |= (UART_17158_EFR_ECB | UART_17158_EFR_IXON); - /* Why? Because Exar's spec says we have to zero it + /* +* Why? Because Exar's spec says we have to zero it * out before setting it */ writeb(0, >ch_neo_uart->efr); @@ -225,7 +228,8 @@ static inline void neo_set_ixoff_flow_control(struct channel_t *ch) ier |= UART_17158_IER_XOFF; efr |= (UART_17158_EFR_ECB | UART_17158_EFR_IXOFF); - /* Why? Because Exar's spec says we have to zero it + /* +* Why? Because Exar's spec says we have to zero it * out before setting it */ writeb(0, >ch_neo_uart->efr); @@ -268,7 +272,8 @@ static inline void neo_set_no_input_flow_control(struct channel_t *ch) else efr &= ~(UART_17158_EFR_ECB | UART_17158_EFR_IXOFF); - /* Why? Because Exar's spec says we have to zero + /* +* Why? Because Exar's spec says we have to zero * it out before setting it */ writeb(0, >ch_neo_uart->efr); @@ -308,7 +313,8 @@ static inline void neo_set_no_output_flow_control(struct channel_t *ch) else efr &= ~(UART_17158_EFR_ECB | UART_17158_EFR_IXON); - /* Why? Because Exar's spec says we have to zero it + /* +* Why? Because Exar's spec says we have to zero it * out before setting it */ writeb(0, >ch_neo_uart->efr); @@ -351,9 +357,8 @@ static inline void neo_set_new_start_stop_chars(struct channel_t *ch) neo_pci_posting_flush(ch->ch_bd); } -/* - * No locks are assumed to be held when calling this function. - */ +/* No locks are assumed to be held when calling this function. */ + static inline void neo_clear_break(struct channel_t *ch, int force) { unsigned long flags; @@ -381,9 +386,8 @@ static inline void neo_clear_break(struct channel_t *ch, int force) spin_unlock_irqrestore(>ch_lock, flags); } -/* - * Parse the ISR register. - */ +/* Parse the ISR register. */ + static inline void neo_parse_isr(struct dgnc_board *brd, uint port) { struct channel_t *ch; @@ -412,8 +416,8 @@ static inline void neo_parse_isr(struct dgnc_board *brd, uint port) if (isr & (UART_17158_IIR_RDI_TIMEOUT | UART_IIR_RDI)) { /* Read data from uart -> queue */ neo_copy_data_from_uart_to_queue(ch); - - /* Call our tty layer to enforce queue + /* +* Call our tty layer to enforce queue * flow control if needed. */ spin_lock_irqsave(>ch_lock, flags); @@ -438,7 +442,8 @@ static inline void neo_parse_isr(struct dgnc_board *brd, uint port) * one it was, so we can suspend or resume data flow. */ if (cause == UART_17158_XON_DETECT) { - /* Is output stopped right now, if so, + /* +* Is output stopped right now, if so, * resume it */ if (brd->channels[port]->ch_flags & CH_STOP) { @@ -609,9 +614,8 @@ static void neo_param(struct tty_struct *tty) if (!bd || bd->magic != DGNC_BOARD_MAGIC) return; - /* -* If baud rate is zero, flush queues, and set mval to dr
[PATCH] staging: dgnc: dgnc_mgmt.c Comment style modifications
Make modifications for comment style Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- drivers/staging/dgnc/dgnc_mgmt.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_mgmt.c b/drivers/staging/dgnc/dgnc_mgmt.c index 683c098..9d9b15d 100644 --- a/drivers/staging/dgnc/dgnc_mgmt.c +++ b/drivers/staging/dgnc/dgnc_mgmt.c @@ -13,13 +13,11 @@ * PURPOSE. See the GNU General Public License for more details. */ -/ - * +/* * This file implements the mgmt functionality for the * Neo and ClassicBoard based product lines. - * - */ + #include #include #include/* For jiffies, task states */ -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 3/3] staging: dgnc: dgnc_driver.h Spelling correction
Make spelling correction for 'statements' Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/dgnc/dgnc_driver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h index 44662d5..63b50bf 100644 --- a/drivers/staging/dgnc/dgnc_driver.h +++ b/drivers/staging/dgnc/dgnc_driver.h @@ -27,7 +27,7 @@ /* Driver defines */ -/* Driver identification and error statments */ +/* Driver identification and error statements */ #definePROCSTR "dgnc" /* /proc entries */ #defineDEVSTR "/dev/dg/dgnc" /* /dev entries */ #defineDRVSTR "dgnc" /* Driver name string */ -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/3] checkpatch modifications dgnc_driver.h
Make Linux kernel coding style modifications for dgnc_driver.h to include: Spelling correction Comment style modifications Align columns Walt Feasel (3): staging: dgnc: dgnc_driver.h Comment style modifications staging: dgnc: dgnc_driver.h Align columns staging: dgnc: dgnc_driver.h Spelling correction drivers/staging/dgnc/dgnc_driver.h | 188 - 1 file changed, 82 insertions(+), 106 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/3] staging: dgnc: dgnc_driver.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/dgnc/dgnc_driver.h | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h index aa95bbb..44662d5 100644 --- a/drivers/staging/dgnc/dgnc_driver.h +++ b/drivers/staging/dgnc/dgnc_driver.h @@ -251,7 +251,7 @@ struct un_t { #define CH_TX_FIFO_EMPTY 0x0400/* TX Fifo is completely empty */ #define CH_TX_FIFO_LWM 0x0800 /* TX Fifo is below Low Water */ #define CH_BREAK_SENDING 0x1000/* Break is being sent */ -#define CH_LOOPBACK 0x2000 /* Channel is in lookback mode */ +#define CH_LOOPBACK0x2000 /* Channel is in lookback mode */ #define CH_BAUD0 0x08000 /* Used for checking B0 transitions */ #define CH_FORCED_STOP 0x2/* Output is forcibly stopped */ #define CH_FORCED_STOPI 0x4/* Input is forcibly stopped */ @@ -267,7 +267,7 @@ struct un_t { /* Channel information structure. */ struct channel_t { int magic; /* Channel Magic Number */ - struct dgnc_board *ch_bd; /* Board structure pointer */ + struct dgnc_board *ch_bd; /* Board structure pointer */ struct digi_t ch_digi;/* Transparent Print structure */ struct un_t ch_tun; /* Terminal unit info */ struct un_t ch_pun; /* Printer unit info */ @@ -297,8 +297,8 @@ struct channel_t { uintch_wopen; /* Waiting for open process cnt */ - unsigned char ch_mostat; /* FEP output modem status */ - unsigned char ch_mistat; /* FEP input modem status */ + unsigned char ch_mostat; /* FEP output modem status */ + unsigned char ch_mistat; /* FEP input modem status */ struct neo_uart_struct __iomem *ch_neo_uart;/* Pointer to the * "mapped" UART struct @@ -324,10 +324,10 @@ struct channel_t { ulong ch_rxcount; /* total of data received so far */ ulong ch_txcount; /* total of data transmitted so far */ - unsigned char ch_r_tlevel;/* Receive Trigger level */ - unsigned char ch_t_tlevel;/* Transmit Trigger level */ + unsigned char ch_r_tlevel;/* Receive Trigger level */ + unsigned char ch_t_tlevel;/* Transmit Trigger level */ - unsigned char ch_r_watermark; /* Receive Watermark */ + unsigned char ch_r_watermark; /* Receive Watermark */ ulong ch_stop_sending_break; /* Time we should STOP * sending a break @@ -358,8 +358,8 @@ extern int dgnc_poll_tick; /* Poll interval - 20 ms */ extern spinlock_t dgnc_global_lock; /* Driver global spinlock */ extern spinlock_t dgnc_poll_lock; /* Poll scheduling lock */ extern uintdgnc_num_boards;/* Total number of boards */ -extern struct dgnc_board *dgnc_board[MAXBOARDS]; /* Array of board -* structs -*/ +extern struct dgnc_board *dgnc_board[MAXBOARDS];/* Array of board +* structs +*/ #endif -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/3] staging: dgnc: dgnc_driver.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/dgnc_driver.h | 170 - 1 file changed, 73 insertions(+), 97 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h index 8792026..aa95bbb 100644 --- a/drivers/staging/dgnc/dgnc_driver.h +++ b/drivers/staging/dgnc/dgnc_driver.h @@ -12,11 +12,8 @@ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * - * * Driver includes - * - */ + */ #ifndef __DGNC_DRIVER_H #define __DGNC_DRIVER_H @@ -28,17 +25,13 @@ #include "digi.h" /* Digi specific ioctl header */ #include "dgnc_sysfs.h"/* Support for SYSFS */ -/* - * - * Driver defines - * - */ +/* Driver defines */ /* Driver identification and error statments */ -#definePROCSTR "dgnc" /* /proc entries */ -#defineDEVSTR "/dev/dg/dgnc" /* /dev entries */ -#defineDRVSTR "dgnc" /* Driver name string */ -#defineDG_PART "40002369_F"/* RPM part number */ +#definePROCSTR "dgnc" /* /proc entries */ +#defineDEVSTR "/dev/dg/dgnc" /* /dev entries */ +#defineDRVSTR "dgnc" /* Driver name string */ +#defineDG_PART "40002369_F"/* RPM part number */ #define TRC_TO_CONSOLE 1 @@ -61,7 +54,8 @@ #define PORT_NUM(dev) ((dev) & 0x7f) #define IS_PRINT(dev) (((dev) & 0xff) >= 0x80) -/* MAX number of stop characters we will send +/* + *MAX number of stop characters we will send * when our read queue is getting full */ #define MAX_STOPS_SENT 5 @@ -88,35 +82,28 @@ #define _POSIX_VDISABLE '\0' #endif -/* - * All the possible states the driver can be while being loaded. - */ +/* All the possible states the driver can be while being loaded. */ + enum { DRIVER_INITIALIZED = 0, DRIVER_READY }; -/* - * All the possible states the board can be while booting up. - */ +/* All the possible states the board can be while booting up. */ + enum { BOARD_FAILED = 0, BOARD_FOUND, BOARD_READY }; -/* - * - * Structures and closely related defines. - * - */ +/* Structures and closely related defines. */ struct dgnc_board; struct channel_t; -/ - * Per board operations structure * - / +/* Per board operations structure */ + struct board_ops { void (*tasklet)(unsigned long data); irqreturn_t (*intr)(int irq, void *voidbrd); @@ -138,16 +125,14 @@ struct board_ops { void (*send_immediate_char)(struct channel_t *ch, unsigned char); }; -/ - * Device flag definitions for bd_flags. - / +/* Device flag definitions for bd_flags. */ + #define BD_IS_PCI_EXPRESS 0x0001 /* Is a PCI Express board */ -/* - * Per-board information - */ +/* Per-board information */ + struct dgnc_board { - int magic; /* Board Magic number. */ + int magic; /* Board Magic number. */ int boardnum; /* Board number: 0-32 */ int type; /* Type of board */ @@ -220,62 +205,56 @@ struct dgnc_board { }; -/ - * Unit flag definitions for un_flags. - / -#define UN_ISOPEN 0x0001 /* Device is open */ -#define UN_CLOSING 0x0002 /* Line is being closed */ -#define UN_IMM 0x0004 /* Service immediately */ -#define UN_BUSY0x0008 /* Some work this channel */ -#define UN_BREAKI 0x0010 /* Input break received */ +/* Unit flag definitions for un_flags. */ +#defin
[PATCH v2 0/3] staging: dgnc: dgnc_driver.c checkpatch modifications
Make Linux kernel coding style modifications for dgnc_driver.c to include: CHECK: Please don't use multiple blank lines CHECK: Blank lines aren't necessary before a close brace '}' Comment style modifications Walt Feasel (3): staging: dgnc: dgnc_driver.c Comment style modifications staging: dgnc: dgnc_driver.c Remove blank lines staging: dgnc: dgnc_driver.c Blank line before } drivers/staging/dgnc/dgnc_driver.c | 60 -- 1 file changed, 19 insertions(+), 41 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/3] staging: dgnc: dgnc_driver.c Comment style modifications
Make modifications to comment styles Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/dgnc/dgnc_driver.c | 57 +- 1 file changed, 20 insertions(+), 37 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c index 6f2bffa..d232dd2 100644 --- a/drivers/staging/dgnc/dgnc_driver.c +++ b/drivers/staging/dgnc/dgnc_driver.c @@ -31,9 +31,8 @@ MODULE_AUTHOR("Digi International, http://www.digi.com;); MODULE_DESCRIPTION("Driver for the Digi International Neo and Classic PCI based product line"); MODULE_SUPPORTED_DEVICE("dgnc"); -/* - * File operations permitted on Control/Management major. - */ +/* File operations permitted on Control/Management major. */ + static const struct file_operations dgnc_board_fops = { .owner = THIS_MODULE, .unlocked_ioctl = dgnc_mgmt_ioctl, @@ -41,9 +40,8 @@ static const struct file_operations dgnc_board_fops = { .release= dgnc_mgmt_close }; -/* - * Globals - */ +/* Globals */ + uint dgnc_num_boards; struct dgnc_board *dgnc_board[MAXBOARDS]; DEFINE_SPINLOCK(dgnc_global_lock); @@ -51,14 +49,12 @@ DEFINE_SPINLOCK(dgnc_poll_lock); /* Poll scheduling lock */ uint dgnc_major; intdgnc_poll_tick = 20;/* Poll interval - 20 ms */ -/* - * Static vars. - */ +/* Static vars. */ + static struct class *dgnc_class; -/* - * Poller stuff - */ +/* Poller stuff */ + static ulong dgnc_poll_time; /* Time of next poll */ static uintdgnc_poll_stop; /* Used to tell poller to stop */ static struct timer_list dgnc_poll_timer; @@ -101,9 +97,8 @@ static const struct board_id dgnc_ids[] = { -/* - * Remap PCI memory. - */ +/* Remap PCI memory. */ + static int dgnc_do_remap(struct dgnc_board *brd) { int rc = 0; @@ -321,7 +316,6 @@ static void dgnc_free_irq(struct dgnc_board *brd) } /* - * * Function: * *dgnc_poll_handler @@ -343,7 +337,6 @@ static void dgnc_free_irq(struct dgnc_board *brd) *As each timer expires, it determines (a) whether the "transmit" *waiter needs to be woken up, and (b) whether the poller needs to *be rescheduled. - * */ static void dgnc_poll_handler(ulong dummy) @@ -371,9 +364,8 @@ static void dgnc_poll_handler(ulong dummy) spin_unlock_irqrestore(>bd_lock, flags); } - /* -* Schedule ourself back at the nominal wakeup interval. -*/ + /* Schedule ourself back at the nominal wakeup interval. */ + spin_lock_irqsave(_poll_lock, flags); dgnc_poll_time += dgnc_jiffies_from_ms(dgnc_poll_tick); @@ -406,9 +398,7 @@ static int dgnc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (IS_ERR(brd)) return PTR_ERR(brd); - /* -* Do tty device initialization. -*/ + /* Do tty device initialization. */ rc = dgnc_tty_register(brd); if (rc < 0) { @@ -454,9 +444,8 @@ static struct pci_driver dgnc_driver = { .id_table = dgnc_pci_tbl, }; -/* - * Start of driver. - */ +/* Start of driver. */ + static int dgnc_start(void) { int rc = 0; @@ -566,11 +555,7 @@ static void dgnc_cleanup_board(struct dgnc_board *brd) kfree(brd); } -/ - * - * Driver load/unload functions - * - / +/* Driver load/unload functions */ static void cleanup(bool sysfiles) { @@ -619,17 +604,15 @@ static int __init dgnc_init_module(void) { int rc; - /* -* Initialize global stuff -*/ + /* Initialize global stuff */ + rc = dgnc_start(); if (rc < 0) return rc; - /* -* Find and configure all the cards -*/ + /* Find and configure all the cards */ + rc = pci_register_driver(_driver); if (rc) { pr_warn("WARNING: dgnc driver load failed. No Digi Neo or Classic boards found.\n"); -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 3/3] staging: dgnc: dgnc_driver.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/dgnc/dgnc_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c index e80d2345..91c9047 100644 --- a/drivers/staging/dgnc/dgnc_driver.c +++ b/drivers/staging/dgnc/dgnc_driver.c @@ -579,7 +579,6 @@ static void cleanup(bool sysfiles) dgnc_cleanup_tty(dgnc_board[i]); dgnc_cleanup_board(dgnc_board[i]); } - } /* -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/3] staging: dgnc: dgnc_driver.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/dgnc/dgnc_driver.c | 4 1 file changed, 4 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c index d232dd2..e80d2345 100644 --- a/drivers/staging/dgnc/dgnc_driver.c +++ b/drivers/staging/dgnc/dgnc_driver.c @@ -95,8 +95,6 @@ static const struct board_id dgnc_ids[] = { { NULL, 0, 0 } }; - - /* Remap PCI memory. */ static int dgnc_do_remap(struct dgnc_board *brd) @@ -626,5 +624,3 @@ static int __init dgnc_init_module(void) module_init(dgnc_init_module); module_exit(dgnc_cleanup_module); - - -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: dgnc: dgnc_cls.c Comment style modifications
Make modifications to comment style format Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/dgnc/dgnc_cls.c | 44 - 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_cls.c b/drivers/staging/dgnc/dgnc_cls.c index aedca66..c20ffdd 100644 --- a/drivers/staging/dgnc/dgnc_cls.c +++ b/drivers/staging/dgnc/dgnc_cls.c @@ -385,9 +385,8 @@ static void cls_copy_data_from_uart_to_queue(struct channel_t *ch) ch->ch_rxcount++; } - /* -* Write new final heads to channel structure. -*/ + /* Write new final heads to channel structure. */ + ch->ch_r_head = head & RQUEUEMASK; ch->ch_e_head = head & EQUEUEMASK; @@ -666,9 +665,8 @@ static void cls_param(struct tty_struct *tty) if (!bd || bd->magic != DGNC_BOARD_MAGIC) return; - /* -* If baud rate is zero, flush queues, and set mval to drop DTR. -*/ + /* If baud rate is zero, flush queues, and set mval to drop DTR. */ + if ((ch->ch_c_cflag & (CBAUD)) == 0) { ch->ch_r_head = 0; ch->ch_r_tail = 0; @@ -887,9 +885,8 @@ static void cls_param(struct tty_struct *tty) cls_parse_modem(ch, readb(>ch_cls_uart->msr)); } -/* - * Our board poller function. - */ +/* Our board poller function. */ + static void cls_tasklet(unsigned long data) { struct dgnc_board *bd = (struct dgnc_board *)data; @@ -914,9 +911,8 @@ static void cls_tasklet(unsigned long data) */ spin_lock_irqsave(>bd_intr_lock, flags); - /* -* If board is ready, parse deeper to see if there is anything to do. -*/ + /* If board is ready, parse deeper to see if there is anything to do. */ + if ((state == BOARD_READY) && (ports > 0)) { /* Loop on each port */ for (i = 0; i < ports; i++) { @@ -938,9 +934,8 @@ static void cls_tasklet(unsigned long data) cls_copy_data_from_queue_to_uart(ch); dgnc_wakeup_writes(ch); - /* -* Check carrier function. -*/ + /* Check carrier function. */ + dgnc_carrier(ch); /* @@ -992,9 +987,8 @@ static irqreturn_t cls_intr(int irq, void *voidbrd) for (i = 0; i < brd->nasync; i++) cls_parse_isr(brd, i); - /* -* Schedule tasklet to more in-depth servicing at a better time. -*/ + /* Schedule tasklet to more in-depth servicing at a better time. */ + tasklet_schedule(>helper_tasklet); spin_unlock_irqrestore(>bd_intr_lock, flags); @@ -1043,9 +1037,7 @@ static int cls_drain(struct tty_struct *tty, uint seconds) un->un_flags |= UN_EMPTY; spin_unlock_irqrestore(>ch_lock, flags); - /* -* NOTE: Do something with time passed in. -*/ + /* NOTE: Do something with time passed in. */ /* If ret is non-zero, user ctrl-c'ed us */ @@ -1112,9 +1104,8 @@ static void cls_uart_init(struct channel_t *ch) readb(>ch_cls_uart->msr); } -/* - * Turns off UART. - */ +/* Turns off UART. */ + static void cls_uart_off(struct channel_t *ch) { writeb(0, >ch_cls_uart->ier); @@ -1160,9 +1151,8 @@ static void cls_send_break(struct channel_t *ch, int msecs) if (!ch || ch->magic != DGNC_CHANNEL_MAGIC) return; - /* -* If we receive a time of 0, this means turn off the break. -*/ + /* If we receive a time of 0, this means turn off the break. */ + if (msecs == 0) { /* Turn break off, and unset some variables */ if (ch->ch_flags & CH_BREAK_SENDING) { -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: dgnc: dgnc_cls.h Spelling correction
Make spelling correction for 'control' Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/dgnc/dgnc_cls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/dgnc/dgnc_cls.h b/drivers/staging/dgnc/dgnc_cls.h index 2597e36..463ad30 100644 --- a/drivers/staging/dgnc/dgnc_cls.h +++ b/drivers/staging/dgnc/dgnc_cls.h @@ -69,7 +69,7 @@ struct cls_uart_struct { #define UART_EXAR654_EFR_IXON 0x2 /* Receiver compares Xon1/Xoff1 */ #define UART_EXAR654_EFR_IXOFF0x8 /* Transmit Xon1/Xoff1 */ #define UART_EXAR654_EFR_RTSDTR 0x40/* Auto RTS/DTR Flow Control Enable */ -#define UART_EXAR654_EFR_CTSDSR 0x80/* Auto CTS/DSR Flow COntrol Enable */ +#define UART_EXAR654_EFR_CTSDSR 0x80/* Auto CTS/DSR Flow Control Enable */ #define UART_EXAR654_IER_XOFF 0x20/* Xoff Interrupt Enable */ #define UART_EXAR654_IER_RTSDTR 0x40/* Output Interrupt Enable */ #define UART_EXAR654_IER_CTSDSR 0x80/* Input Interrupt Enable */ -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3] staging: vme: vme_user.c Spelling corrections
Make spelling corrections for 'correctly' and 'unregister' Signed-off-by: Walt Feasel <waltfea...@gmail.com> Acked-by: Martyn Welch --- v2 Removed the previously submitted U.S. spelling for 'initialise' to keep the correct U.K. spelling. v3 makes changes to correct for email format patch submission drivers/staging/vme/devices/vme_user.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index 5dd430f..2753fb2 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c @@ -661,7 +661,7 @@ static int vme_user_probe(struct vme_dev *vdev) } class_destroy(vme_user_sysfs_class); - /* Ensure counter set correcty to unalloc all master windows */ + /* Ensure counter set correctly to unalloc all master windows */ i = MASTER_MAX + 1; err_master: while (i > MASTER_MINOR) { @@ -671,7 +671,7 @@ static int vme_user_probe(struct vme_dev *vdev) } /* -* Ensure counter set correcty to unalloc all slave windows and buffers +* Ensure counter set correctly to unalloc all slave windows and buffers */ i = SLAVE_MAX + 1; err_slave: @@ -716,7 +716,7 @@ static int vme_user_remove(struct vme_dev *dev) /* Unregister device driver */ cdev_del(vme_user_cdev); - /* Unregiser the major and minor device numbers */ + /* Unregister the major and minor device numbers */ unregister_chrdev_region(MKDEV(VME_MAJOR, 0), VME_DEVS); return 0; -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: xgifb: XGI_main.h Align data columns
Make modifications to data column alignment Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/xgifb/XGI_main.h | 54 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 85079fe..7a80a90 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -139,7 +139,7 @@ static const struct _XGIbios_mode { static const unsigned short XGI310paneltype[] = { LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, -LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960, +LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960, LCD_1152x768, LCD_1400x1050, LCD_1280x768, LCD_1600x1200, LCD_1024x768, LCD_1024x768, LCD_1024x768}; @@ -174,7 +174,7 @@ static const struct _XGI_tvtype { {"NTSC",2}, {"pal", 1}, {"ntsc",2}, - {"\0", -1} + {"\0", -1} }; static const struct _XGI_vrate { @@ -183,44 +183,44 @@ static const struct _XGI_vrate { u16 yres; u16 refresh; } XGIfb_vrate[] = { - {1, 640, 480, 60}, {2, 640, 480, 72}, - {3, 640, 480, 75}, {4, 640, 480, 85}, + {1, 640, 480, 60}, {2, 640, 480, 72}, + {3, 640, 480, 75}, {4, 640, 480, 85}, {5, 640, 480, 100}, {6, 640, 480, 120}, - {7, 640, 480, 160}, {8, 640, 480, 200}, + {7, 640, 480, 160}, {8, 640, 480, 200}, - {1, 720, 480, 60}, - {1, 720, 576, 58}, - {1, 800, 480, 60}, {2, 800, 480, 75}, {3, 800, 480, 85}, - {1, 800, 600, 60}, {2, 800, 600, 72}, {3, 800, 600, 75}, - {4, 800, 600, 85}, {5, 800, 600, 100}, - {6, 800, 600, 120}, {7, 800, 600, 160}, + {1, 720, 480, 60}, + {1, 720, 576, 58}, + {1, 800, 480, 60}, {2, 800, 480, 75}, {3, 800, 480, 85}, + {1, 800, 600, 60}, {2, 800, 600, 72}, {3, 800, 600, 75}, + {4, 800, 600, 85}, {5, 800, 600, 100}, + {6, 800, 600, 120}, {7, 800, 600, 160}, - {1, 1024, 768, 60}, {2, 1024, 768, 70}, {3, 1024, 768, 75}, - {4, 1024, 768, 85}, {5, 1024, 768, 100}, {6, 1024, 768, 120}, - {1, 1024, 576, 60}, {2, 1024, 576, 75}, {3, 1024, 576, 85}, - {1, 1024, 600, 60}, - {1, 1152, 768, 60}, - {1, 1280, 720, 60}, {2, 1280, 720, 75}, {3, 1280, 720, 85}, - {1, 1280, 768, 60}, + {1, 1024, 768, 60}, {2, 1024, 768, 70}, {3, 1024, 768, 75}, + {4, 1024, 768, 85}, {5, 1024, 768, 100}, {6, 1024, 768, 120}, + {1, 1024, 576, 60}, {2, 1024, 576, 75}, {3, 1024, 576, 85}, + {1, 1024, 600, 60}, + {1, 1152, 768, 60}, + {1, 1280, 720, 60}, {2, 1280, 720, 75}, {3, 1280, 720, 85}, + {1, 1280, 768, 60}, {1, 1280, 1024, 60}, {2, 1280, 1024, 75}, {3, 1280, 1024, 85}, - {1, 1280, 960, 70}, - {1, 1400, 1050, 60}, - {1, 1600, 1200, 60}, {2, 1600, 1200, 65}, + {1, 1280, 960, 70}, + {1, 1400, 1050, 60}, + {1, 1600, 1200, 60}, {2, 1600, 1200, 65}, {3, 1600, 1200, 70}, {4, 1600, 1200, 75}, - {5, 1600, 1200, 85}, {6, 1600, 1200, 100}, + {5, 1600, 1200, 85}, {6, 1600, 1200, 100}, {7, 1600, 1200, 120}, - {1, 1920, 1440, 60}, {2, 1920, 1440, 65}, + {1, 1920, 1440, 60}, {2, 1920, 1440, 65}, {3, 1920, 1440, 70}, {4, 1920, 1440, 75}, - {5, 1920, 1440, 85}, {6, 1920, 1440, 100}, - {1, 2048, 1536, 60}, {2, 2048, 1536, 65}, + {5, 1920, 1440, 85}, {6, 1920, 1440, 100}, + {1, 2048, 1536, 60}, {2, 2048, 1536, 65}, {3, 2048, 1536, 70}, {4, 2048, 1536, 75}, - {5, 2048, 1536, 85}, - {0, 0, 0, 0} + {5, 2048, 1536, 85}, + {0,0,0, 0} }; static const struct _XGI_TV_filter { -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: xgifb: vb_util.h Space after cast
Make suggested checkpatch modification for CHECK: No space is necessary after a cast Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/xgifb/vb_util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/xgifb/vb_util.h b/drivers/staging/xgifb/vb_util.h index 08db58b..052694e 100644 --- a/drivers/staging/xgifb/vb_util.h +++ b/drivers/staging/xgifb/vb_util.h @@ -18,7 +18,7 @@ static inline void xgifb_reg_and_or(unsigned long port, u8 index, u8 temp; temp = xgifb_reg_get(port, index); - temp = (u8) ((temp & data_and) | data_or); + temp = (u8)((temp & data_and) | data_or); xgifb_reg_set(port, index, temp); } @@ -28,7 +28,7 @@ static inline void xgifb_reg_and(unsigned long port, u8 index, u8 temp; temp = xgifb_reg_get(port, index); - temp = (u8) (temp & data_and); + temp = (u8)(temp & data_and); xgifb_reg_set(port, index, temp); } -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 7/7] staging: xgifb: vb_setmode.c Align match 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/xgifb/vb_setmode.c | 299 + 1 file changed, 141 insertions(+), 158 deletions(-) diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 61ab40b..7c7c8c8 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -167,7 +167,8 @@ static unsigned char XGI_SetDefaultVCLK(struct vb_device_info *pVBInfo) } static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, - unsigned short RefreshRateTableIndex, unsigned short *i, + unsigned short RefreshRateTableIndex, + unsigned short *i, struct vb_device_info *pVBInfo) { unsigned short tempax, tempbx, resinfo, modeflag, infoflag; @@ -244,7 +245,7 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex, } static void XGI_SetSync(unsigned short RefreshRateTableIndex, - struct vb_device_info *pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short sync, temp; @@ -257,7 +258,7 @@ static void XGI_SetSync(unsigned short RefreshRateTableIndex, } static void XGI_SetCRT1Timing_H(struct vb_device_info *pVBInfo, - struct xgi_hw_device_info *HwDeviceExtension) + struct xgi_hw_device_info *HwDeviceExtension) { unsigned char data, data1, pushax; unsigned short i, j; @@ -359,9 +360,9 @@ static void XGI_SetCRT1Timing_V(unsigned short ModeIdIndex, } static void XGI_SetCRT1CRTC(unsigned short ModeIdIndex, - unsigned short RefreshRateTableIndex, - struct vb_device_info *pVBInfo, - struct xgi_hw_device_info *HwDeviceExtension) + unsigned short RefreshRateTableIndex, + struct vb_device_info *pVBInfo, + struct xgi_hw_device_info *HwDeviceExtension) { unsigned char index, data; unsigned short i; @@ -397,7 +398,7 @@ static void XGI_SetCRT1CRTC(unsigned short ModeIdIndex, * Description : Set LCD timing */ static void XGI_SetXG21CRTC(unsigned short RefreshRateTableIndex, - struct vb_device_info *pVBInfo) + struct vb_device_info *pVBInfo) { unsigned char index, Tempax, Tempbx, Tempcx, Tempdx; unsigned short Temp1, Temp2, Temp3; @@ -665,19 +666,19 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo, if (index != -1) { xgifb_reg_set(pVBInfo->P3d4, 0x02, - XGI_UpdateCRT1Table[index].CR02); + XGI_UpdateCRT1Table[index].CR02); xgifb_reg_set(pVBInfo->P3d4, 0x03, - XGI_UpdateCRT1Table[index].CR03); + XGI_UpdateCRT1Table[index].CR03); xgifb_reg_set(pVBInfo->P3d4, 0x15, - XGI_UpdateCRT1Table[index].CR15); + XGI_UpdateCRT1Table[index].CR15); xgifb_reg_set(pVBInfo->P3d4, 0x16, - XGI_UpdateCRT1Table[index].CR16); + XGI_UpdateCRT1Table[index].CR16); } } static void XGI_SetCRT1DE(unsigned short ModeIdIndex, - unsigned short RefreshRateTableIndex, - struct vb_device_info *pVBInfo) + unsigned short RefreshRateTableIndex, + struct vb_device_info *pVBInfo) { unsigned short resindex, tempax, tempbx, tempcx, temp, modeflag; @@ -715,7 +716,7 @@ static void XGI_SetCRT1DE(unsigned short ModeIdIndex, xgifb_reg_set(pVBInfo->P3d4, 0x11, data); /* Unlock CRTC */ xgifb_reg_set(pVBInfo->P3d4, 0x01, (unsigned short)(tempcx & 0xff)); xgifb_reg_and_or(pVBInfo->P3d4, 0x0b, ~0x0c, - (unsigned short)((tempcx & 0x0ff00) >> 10)); +(unsigned short)((tempcx & 0x0ff00) >> 10)); xgifb_reg_set(pVBInfo->P3d4, 0x12, (unsigned short)(tempbx & 0xff)); tempax = 0; tempbx >>= 8; @@ -822,8 +823,8 @@ static void XGI_SetCRT1Offset(unsigned short ModeNo, } static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeIdIndex, - unsigned short RefreshRateTableIndex, - struct vb_device_info *pVBInfo) + unsigned short RefreshRateTableIndex, + struct vb_device_info *pVBInfo) { unsigned short VCLKIndex, modeflag; @@ -951,8 +952,8 @@ static void XGI_SetCRT1FIFO(struct xgi_hw_device_info *HwDeviceExtensi
[PATCH v2 2/7] staging: xgifb: vb_setmode.c Comment style 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/xgifb/vb_setmode.c | 234 ++--- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 1655d3a..7383100 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -55,7 +55,7 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) pVBInfo->XGINew_CR97 = 0xc1; pVBInfo->SR18 = XG27_SR18; - /*Z11m DDR*/ + /* Z11m DDR */ temp = xgifb_reg_get(pVBInfo->P3c4, 0x3B); /* SR3B[7][3]MAA15 MAA11 (Power on Trapping) */ if (((temp & 0x88) == 0x80) || ((temp & 0x88) == 0x08)) @@ -390,12 +390,12 @@ static void XGI_SetCRT1CRTC(unsigned short ModeIdIndex, xgifb_reg_set(pVBInfo->P3d4, 0x14, 0x4F); } -/* - */ -/* Function : XGI_SetXG21CRTC */ -/* Input : Stand or enhance CRTC table */ -/* Output : Fill CRT Hsync/Vsync to SR2E/SR2F/SR30/SR33/SR34/SR3F */ -/* Description : Set LCD timing */ -/* - */ +/* + * Function : XGI_SetXG21CRTC + * Input : Stand or enhance CRTC table + * Output : Fill CRT Hsync/Vsync to SR2E/SR2F/SR30/SR33/SR34/SR3F + * Description : Set LCD timing + */ static void XGI_SetXG21CRTC(unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo) { @@ -506,7 +506,7 @@ static void XGI_SetXG27CRTC(unsigned short RefreshRateTableIndex, /* SR0B */ Tempax = XGI_CRT1Table[index].CR[5]; - Tempax &= 0xC0; /* Tempax[7:6]: SR0B[7:6]: HRS[9:8]*/ + Tempax &= 0xC0; /* Tempax[7:6]: SR0B[7:6]: HRS[9:8] */ Tempbx |= Tempax << 2; /* Tempbx: HRS[9:0] */ Tempax = XGI_CRT1Table[index].CR[4]; /* CR5 HRE */ @@ -636,12 +636,12 @@ static void xgifb_set_lcd(int chip_id, xgifb_reg_or(pVBInfo->P3c4, 0x35, 0x80); } -/* - */ -/* Function : XGI_UpdateXG21CRTC */ -/* Input : */ -/* Output : CRT1 CRTC */ -/* Description : Modify CRT1 Hsync/Vsync to fix LCD mode timing */ -/* - */ +/* + * Function : XGI_UpdateXG21CRTC + * Input : + * Output : CRT1 CRTC + * Description : Modify CRT1 Hsync/Vsync to fix LCD mode timing + */ static void XGI_UpdateXG21CRTC(unsigned short ModeNo, struct vb_device_info *pVBInfo, unsigned short RefreshRateTableIndex) @@ -830,7 +830,7 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeIdIndex, /* si+Ext_ResInfo */ modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag; - if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) { /*301b*/ + if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) { /* 301b */ if (pVBInfo->LCDResInfo != Panel_1024x768) /* LCDXlat2VCLK */ VCLKIndex = VCLK108_2_315 + 5; @@ -1620,12 +1620,12 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex, (unsigned short) (temp3 & 0xff)); } -/* - */ -/* Function : XGI_GETLCDVCLKPtr */ -/* Input : */ -/* Output : al -> VCLK Index */ -/* Description : */ -/* - */ +/* + * Function : XGI_GETLCDVCLKPtr + * Input : + * Output : al -> VCLK Index + * Description : + */ static void XGI_GetLCDVCLKPtr(unsigned char *di_0, unsigned char *di_1, struct vb_device_info *pVBInfo) { @@ -2075,7 +2075,7 @@ static unsigned char XGI_GetLCDInfo(unsigned short ModeIdIndex, pVBInfo->LCDTypeInfo = 0; pVBInfo->LCDInfo = 0; - /* si+Ext_ResInfo // */ + /* si+Ext_ResInfo */ resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO; temp = xgifb_reg_get(pVBInfo->P3d4, 0x36); /* Get LCD Res.Info */ tempbx = temp & 0x0F; @@ -2172,12 +2172,12 @@ static unsigned char XG21GPIODataTransfer(unsigned char ujDate) return ujRet; } -/**/ -/* output */ -/* bl[5] : LVDS signal */ -/* bl[1] : LVDS backlight */ -/* bl[0] : LVDS VDD */ -/*---
[PATCH v2 3/7] staging: xgifb: vb_setmode.c Space around operator
Make suggested checkpatch modificationfor 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/xgifb/vb_setmode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 7383100..480d94a 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -73,7 +73,7 @@ static void XGI_SetSeqRegs(struct vb_device_info *pVBInfo) /* Get SR1,2,3,4 from file */ /* SR1 is with screen off 0x20 */ SRdata = XGI330_StandTable.SR[i]; - xgifb_reg_set(pVBInfo->P3c4, i+1, SRdata); /* Set SR 1 2 3 4 */ + xgifb_reg_set(pVBInfo->P3c4, i + 1, SRdata); /* Set SR 1 2 3 4 */ } } -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 4/7] staging: xgifb: vb_setmode.c Braces single statement blocks
Make suggested checkpatch modificationfor WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/xgifb/vb_setmode.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 480d94a..9c26f0a 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -1681,13 +1681,11 @@ static unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex, return tempal; } - if (pVBInfo->TVInfo & TVSetYPbPr750p) { + if (pVBInfo->TVInfo & TVSetYPbPr750p) return XGI_YPbPr750pVCLK; - } - if (pVBInfo->TVInfo & TVSetYPbPr525p) { + if (pVBInfo->TVInfo & TVSetYPbPr525p) return YPbPr525pVCLK; - } tempal = NTSC1024VCLK; -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 5/7] staging: xgifb: vb_setmode.c Space after cast
Make suggested checkpatch modification for CHECK: No space is necessary after a cast Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/xgifb/vb_setmode.c | 139 ++--- 1 file changed, 69 insertions(+), 70 deletions(-) diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 9c26f0a..2d430c3 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -796,7 +796,7 @@ static void XGI_SetCRT1Offset(unsigned short ModeNo, i |= temp; xgifb_reg_set(pVBInfo->P3c4, 0x0E, i); - temp = (unsigned char) temp2; + temp = (unsigned char)temp2; temp &= 0xFF; /* al */ xgifb_reg_set(pVBInfo->P3d4, 0x13, temp); @@ -1087,9 +1087,9 @@ static void XGI_WriteDAC(unsigned short dl, else swap(bl, bh); } - outb((unsigned short) dh, pVBInfo->P3c9); - outb((unsigned short) bh, pVBInfo->P3c9); - outb((unsigned short) bl, pVBInfo->P3c9); + outb((unsigned short)dh, pVBInfo->P3c9); + outb((unsigned short)bh, pVBInfo->P3c9); + outb((unsigned short)bl, pVBInfo->P3c9); } static void XGI_LoadDAC(struct vb_device_info *pVBInfo) @@ -1441,9 +1441,9 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex, tempbx >>= 3; xgifb_reg_set(pVBInfo->Part1Port, 0x16, - (unsigned short) (tempbx & 0xff)); + (unsigned short)(tempbx & 0xff)); xgifb_reg_set(pVBInfo->Part1Port, 0x17, - (unsigned short) (tempcx & 0xff)); + (unsigned short)(tempcx & 0xff)); tempax = pVBInfo->HT; @@ -1469,7 +1469,7 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex, xgifb_reg_set(pVBInfo->Part1Port, 0x15, tempax); xgifb_reg_set(pVBInfo->Part1Port, 0x14, - (unsigned short) (tempbx & 0xff)); + (unsigned short)(tempbx & 0xff)); tempax = pVBInfo->VT; tempbx = LCDPtr1->LCDVDES; @@ -1481,15 +1481,15 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex, tempcx -= tempax; xgifb_reg_set(pVBInfo->Part1Port, 0x1b, - (unsigned short) (tempbx & 0xff)); + (unsigned short)(tempbx & 0xff)); xgifb_reg_set(pVBInfo->Part1Port, 0x1c, - (unsigned short) (tempcx & 0xff)); + (unsigned short)(tempcx & 0xff)); tempbx = (tempbx >> 8) & 0x07; tempcx = (tempcx >> 8) & 0x07; xgifb_reg_set(pVBInfo->Part1Port, 0x1d, - (unsigned short) ((tempcx << 3) + (unsigned short)((tempcx << 3) | tempbx)); tempax = pVBInfo->VT; @@ -1505,9 +1505,9 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex, tempcx -= tempax; xgifb_reg_set(pVBInfo->Part1Port, 0x18, - (unsigned short) (tempbx & 0xff)); + (unsigned short)(tempbx & 0xff)); xgifb_reg_and_or(pVBInfo->Part1Port, 0x19, ~0x0f, - (unsigned short) (tempcx & 0x0f)); + (unsigned short)(tempcx & 0x0f)); tempax = ((tempbx >> 8) & 0x07) << 3; @@ -1527,7 +1527,7 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex, temp = tempax; /* 0430 ylshieh */ temp1 = (temp << 18) / tempbx; - tempdx = (unsigned short) ((temp << 18) % tempbx); + tempdx = (unsigned short)((temp << 18) % tempbx); if (tempdx != 0) temp1 += 1; @@ -1536,11 +1536,11 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex, push3 = temp2; xgifb_reg_set(pVBInfo->Part1Port, 0x37, - (unsigned short) (temp2 & 0xff)); + (unsigned short)(temp2 & 0xff)); xgifb_reg_set(pVBInfo->Part1Port, 0x36, - (unsigned short) ((temp2 >> 8) & 0xff)); + (unsigned short)((temp2 >> 8) & 0xff)); - tempbx = (unsigned short) (temp2 >> 16); + tempbx = (unsigned short)(temp2 >> 16); tempax = tempbx & 0x03; tempbx = pVBInfo->VGAVDE; @@ -1553,15 +1553,15 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex, temp2 = push3; xgifb_reg_set(pVBInfo->Part4Port, 0x3c, - (unsigned short) (temp2 & 0xff)); + (unsigned short)(temp2 & 0xff)); xgifb_re
[PATCH v2 6/7] staging: xgifb: vb_setmode.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/xgifb/vb_setmode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 2d430c3..61ab40b 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -4993,8 +4993,8 @@ static void XGI_SetCRT2ModeRegs(struct vb_device_info *pVBInfo) tempah |= 0x40; } - if ((pVBInfo->LCDResInfo == Panel_1280x1024) - || (pVBInfo->LCDResInfo == Panel_1280x1024x75)) + if ((pVBInfo->LCDResInfo == Panel_1280x1024) || + (pVBInfo->LCDResInfo == Panel_1280x1024x75)) tempah |= 0x80; if (pVBInfo->LCDResInfo == Panel_1280x960) -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/7] staging: xgifb: vb_setmode.c Comment Spelling correction
Make spelling correction for 'vertical'. Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/xgifb/vb_setmode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 6467d96..1655d3a 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -3061,7 +3061,7 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, tempbx = pVBInfo->VGAVT; push1 = tempbx; tempcx = 0x121; - tempbx = pVBInfo->VGAVDE; /* 0x0E Virtical Display End */ + tempbx = pVBInfo->VGAVDE; /* 0x0E Vertical Display End */ if (tempbx == 357) tempbx = 350; @@ -3113,7 +3113,7 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, if (tempbx & 0x0400) tempcx |= 0x0600; - /* 0x11 Vertival Blank End */ + /* 0x11 Vertical Blank End */ xgifb_reg_set(pVBInfo->Part1Port, 0x11, 0x00); tempax = push1; -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/7] staging: xgifb: vb_setmode.c checkpatch modifications
Make Linux kernel coding style modifications for vb_setmode.c to include: CHECK: spaces preferred around that CHECK: Alignment should match open parenthesis CHECK: No space is necessary after a cast WARNING: braces {} are not necessary for single statement blocks CHECK: Logical continuations should be on the previous line Spelling Comment style modifications Walt Feasel (7): staging: xgifb: vb_setmode.c Comment Spelling correction staging: xgifb: vb_setmode.c Comment style modifications staging: xgifb: vb_setmode.c Space around operator staging: xgifb: vb_setmode.c Braces single statement blocks staging: xgifb: vb_setmode.c Space after cast staging: xgifb: vb_setmode.c Logical continuation staging: xgifb: vb_setmode.c Align match parenthesis drivers/staging/xgifb/vb_setmode.c | 642 ++--- 1 file changed, 311 insertions(+), 331 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 4/7] staging: xgifb: XGI_main_26.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/xgifb/XGI_main_26.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 9218c74..6e8df20 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -561,7 +561,7 @@ static u8 XGIfb_search_refresh_rate(struct xgifb_video_info *xgifb_info, != 1)) { pr_debug("Adjusting rate from %d down to %d\n", rate, -XGIfb_vrate[i-1].refresh); +XGIfb_vrate[i - 1].refresh); xgifb_info->rate_idx = XGIfb_vrate[i - 1].idx; xgifb_info->refresh_rate = @@ -1696,7 +1696,7 @@ static int xgifb_probe(struct pci_dev *pdev, case PCI_DEVICE_ID_XGI_20: xgifb_reg_or(XGICR, Index_CR_GPIO_Reg3, GPIOG_EN); CR48 = xgifb_reg_get(XGICR, Index_CR_GPIO_Reg1); - if (CR48_READ) + if (CR48 & GPIOG_READ) xgifb_info->chip = XG21; else xgifb_info->chip = XG20; @@ -1782,9 +1782,9 @@ static int xgifb_probe(struct pci_dev *pdev, xgifb_info->hasVB = HASVB_NONE; } else if (xgifb_info->chip == XG21) { CR38 = xgifb_reg_get(XGICR, 0x38); - if ((CR38&0xE0) == 0xC0) + if ((CR38 & 0xE0) == 0xC0) xgifb_info->display2 = XGIFB_DISP_LCD; - else if ((CR38&0xE0) == 0x60) + else if ((CR38 & 0xE0) == 0x60) xgifb_info->hasVB = HASVB_CHRONTEL; else xgifb_info->hasVB = HASVB_NONE; -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 5/7] staging: xgifb: XGI_main_26.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/xgifb/XGI_main_26.c | 12 1 file changed, 12 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 6e8df20..b1fe17e 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -729,7 +729,6 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info) if (xgifb_info->display2 == XGIFB_DISP_TV && xgifb_info->hasVB == HASVB_301) { - reg = xgifb_reg_get(XGIPART4, 0x01); if (reg < 0xB0) { /* Set filter for XGI301 */ @@ -762,16 +761,13 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info) 0x01); if (xgifb_info->TV_type == TVMODE_NTSC) { - xgifb_reg_and(XGIPART2, 0x3a, 0x1f); if (xgifb_info->TV_plug == TVPLUG_SVIDEO) { - xgifb_reg_and(XGIPART2, 0x30, 0xdf); } else if (xgifb_info->TV_plug == TVPLUG_COMPOSITE) { - xgifb_reg_or(XGIPART2, 0x30, 0x20); switch (xgifb_info->video_width) { @@ -821,16 +817,13 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info) } } else if (xgifb_info->TV_type == TVMODE_PAL) { - xgifb_reg_and(XGIPART2, 0x3A, 0x1F); if (xgifb_info->TV_plug == TVPLUG_SVIDEO) { - xgifb_reg_and(XGIPART2, 0x30, 0xDF); } else if (xgifb_info->TV_plug == TVPLUG_COMPOSITE) { - xgifb_reg_or(XGIPART2, 0x30, 0x20); switch (xgifb_info->video_width) { @@ -991,7 +984,6 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive, } if (isactive) { - XGIfb_pre_setmode(xgifb_info); if (XGISetModeNew(xgifb_info, hw_info, XGIbios_mode[xgifb_info->mode_idx].mode_no) @@ -1274,7 +1266,6 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) } if (!found_mode) { - pr_err("%dx%dx%d is no valid mode\n", var->xres, var->yres, var->bits_per_pixel); search_idx = 0; @@ -1399,7 +1390,6 @@ static struct fb_ops XGIfb_ops = { static int XGIfb_get_dram_size(struct xgifb_video_info *xgifb_info) { - u8 ChannelNum, tmp; u8 reg = 0; @@ -1595,7 +1585,6 @@ static int __init XGIfb_setup(char *options) pr_info("Options: %s\n", options); while ((this_opt = strsep(, ",")) != NULL) { - if (!*this_opt) continue; @@ -1977,7 +1966,6 @@ static int xgifb_probe(struct pci_dev *pdev, _info->var.vsync_len, _info->var.sync, _info->var.vmode)) { - if ((fb_info->var.vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) { fb_info->var.yres <<= 1; -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 7/7] staging: xgifb: XGI_main_26.c Align match 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/xgifb/XGI_main_26.c | 100 +--- 1 file changed, 46 insertions(+), 54 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index e31d107..777cd6e 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -56,8 +56,8 @@ static inline void dumpVGAReg(struct xgifb_video_info *xgifb_info) /* --- Hardware Access Routines -- */ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr, - struct xgi_hw_device_info *HwDeviceExtension, - unsigned char modeno) +struct xgi_hw_device_info *HwDeviceExtension, +unsigned char modeno) { unsigned short ModeNo = modeno; unsigned short ModeIdIndex = 0, ClockIndex = 0; @@ -68,7 +68,7 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr, XGI_SearchModeID(ModeNo, ); RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo, - ModeIdIndex, XGI_Pr); + ModeIdIndex, XGI_Pr); ClockIndex = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK; @@ -76,11 +76,11 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr, } static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, - struct xgi_hw_device_info *HwDeviceExtension, - unsigned char modeno, - u32 *left_margin, u32 *right_margin, u32 *upper_margin, - u32 *lower_margin, u32 *hsync_len, u32 *vsync_len, u32 *sync, - u32 *vmode) + struct xgi_hw_device_info *HwDeviceExtension, + unsigned char modeno, u32 *left_margin, + u32 *right_margin, u32 *upper_margin, + u32 *lower_margin, u32 *hsync_len, + u32 *vsync_len, u32 *sync, u32 *vmode) { unsigned short ModeNo = modeno; unsigned short ModeIdIndex, index = 0; @@ -95,7 +95,7 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, if (!XGI_SearchModeID(ModeNo, )) return 0; RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo, - ModeIdIndex, XGI_Pr); + ModeIdIndex, XGI_Pr); index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC; sr_data = XGI_CRT1Table[index].CR[5]; @@ -682,7 +682,7 @@ static void XGIfb_pre_setmode(struct xgifb_video_info *xgifb_info) xgifb_reg_set(XGICR, IND_XGI_SCRATCH_REG_CR30, cr30); xgifb_reg_set(XGICR, IND_XGI_SCRATCH_REG_CR31, cr31); xgifb_reg_set(XGICR, IND_XGI_SCRATCH_REG_CR33, - (xgifb_info->rate_idx & 0x0F)); + (xgifb_info->rate_idx & 0x0F)); } static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info) @@ -904,7 +904,7 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info) } static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive, - struct fb_info *info) + struct fb_info *info) { struct xgifb_video_info *xgifb_info = info->par; struct xgi_hw_device_info *hw_info = _info->hw_info; @@ -944,10 +944,8 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive, } pr_debug("Change mode to %dx%dx%d-%dHz\n", - var->xres, - var->yres, - var->bits_per_pixel, - xgifb_info->refresh_rate); +var->xres, var->yres, var->bits_per_pixel, +xgifb_info->refresh_rate); old_mode = xgifb_info->mode_idx; xgifb_info->mode_idx = 0; @@ -1159,7 +1157,7 @@ static int XGIfb_setcolreg(unsigned int regno, unsigned int red, /* --- FBDev related routines for all series -- */ static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con, - struct fb_info *info) +struct fb_info *info) { struct xgifb_video_info *xgifb_info = info->par; @@ -1253,10 +1251,10 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) search_idx = 0; while ((XGIbios_mode[search_idx].mode_no != 0) && - (XGIbios_mode[search_idx].xres <= var->xres)) { + (XGIbios_mode[search_idx].xr
[PATCH v2 1/7] staging: xgifb: XGI_main_26.c Comment style 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/xgifb/XGI_main_26.c | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 982f90f..95999cd 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -1064,7 +1064,7 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive, break; } } - XGIfb_bpp_to_var(xgifb_info, var); /*update ARGB info*/ + XGIfb_bpp_to_var(xgifb_info, var); /* update ARGB info */ dumpVGAReg(xgifb_info); return 0; @@ -1688,7 +1688,7 @@ static int xgifb_probe(struct pci_dev *pdev, xgifb_reg_set(XGISR, IND_SIS_PASSWORD, SIS_PASSWORD); reg1 = xgifb_reg_get(XGISR, IND_SIS_PASSWORD); - if (reg1 != 0xa1) { /*I/O error */ + if (reg1 != 0xa1) { /* I/O error */ dev_err(>dev, "I/O error\n"); ret = -EIO; goto error_disable; @@ -1727,7 +1727,7 @@ static int xgifb_probe(struct pci_dev *pdev, xgifb_info->video_size = video_size_max; } - /* Enable PCI_LINEAR_ADDRESSING and MMIO_ENABLE */ + /* Enable PCI_LINEAR_ADDRESSING and MMIO_ENABLE */ xgifb_reg_or(XGISR, IND_SIS_PCI_ADDRESS_SET, (SIS_PCI_ADDR_ENABLE | SIS_MEM_MAP_IO_ENABLE)); @@ -2028,9 +2028,7 @@ static int xgifb_probe(struct pci_dev *pdev, return ret; } -/*/ -/*PCI DEVICE HANDLING*/ -/*/ +/* PCI DEVICE HANDLING */ static void xgifb_remove(struct pci_dev *pdev) { @@ -2054,9 +2052,7 @@ static struct pci_driver xgifb_driver = { .remove = xgifb_remove }; -/*/ -/* MODULE */ -/*/ +/* MODULE */ module_param(mode, charp, ); MODULE_PARM_DESC(mode, -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 6/7] staging: xgifb: XGI_main_26.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/xgifb/XGI_main_26.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index b1fe17e..e31d107 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -1465,7 +1465,6 @@ static int XGIfb_get_dram_size(struct xgifb_video_info *xgifb_info) reg, xgifb_info->video_size, ChannelNum); return 0; - } static void XGIfb_detect_VB(struct xgifb_video_info *xgifb_info) @@ -1976,7 +1975,6 @@ static int xgifb_probe(struct pci_dev *pdev, fb_info->var.yres >>= 1; fb_info->var.yres_virtual >>= 1; } - } fb_info->flags = FBINFO_FLAG_DEFAULT; -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/7] staging: xgifb: XGI_main_26.c checkpatch modifications
Make Linux kernel coding style modifications for XGI_main_26.c to include: CHECK: Alignment should match open parenthesis CHECK: No space is necessary after a cast CHECK: Logical continuations should be on the previous line CHECK: spaces preferred around that '-' CHECK: Blank lines aren't necessary after an open brace '{' CHECK: Blank lines aren't necessary before a close brace '}' Comment style modifications Walt Feasel (7): staging: xgifb: XGI_main_26.c Comment style modifications staging: xgifb: XGI_main_26.c No space after cast staging: xgifb: XGI_main_26.c Logical continuation staging: xgifb: XGI_main_26.c Space around operator staging: xgifb: XGI_main_26.c Blank line after { staging: xgifb: XGI_main_26.c Blank line before } staging: xgifb: XGI_main_26.c Align match parenthesis drivers/staging/xgifb/XGI_main_26.c | 184 +++- 1 file changed, 78 insertions(+), 106 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/7] staging: xgifb: XGI_main_26.c No space after cast
Make suggested checkpatch modification for CHECK: No space is necessary after a cast Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/xgifb/XGI_main_26.c | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 95999cd..51b1194 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -105,7 +105,7 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, cr_data = XGI_CRT1Table[index].CR[3]; /* Horizontal retrace (=sync) start */ - HRS = (cr_data & 0xff) | ((unsigned short) (sr_data & 0xC0) << 2); + HRS = (cr_data & 0xff) | ((unsigned short)(sr_data & 0xC0) << 2); F = HRS - HDE - 3; sr_data = XGI_CRT1Table[index].CR[6]; @@ -115,8 +115,8 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, cr_data2 = XGI_CRT1Table[index].CR[4]; /* Horizontal blank end */ - HBE = (cr_data & 0x1f) | ((unsigned short) (cr_data2 & 0x80) >> 2) - | ((unsigned short) (sr_data & 0x03) << 6); + HBE = (cr_data & 0x1f) | ((unsigned short)(cr_data2 & 0x80) >> 2) + | ((unsigned short)(sr_data & 0x03) << 6); /* Horizontal retrace (=sync) end */ HRE = (cr_data2 & 0x1f) | ((sr_data & 0x04) << 3); @@ -142,15 +142,15 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, cr_data = XGI_CRT1Table[index].CR[10]; /* Vertical retrace (=sync) start */ - VRS = (cr_data & 0xff) | ((unsigned short) (cr_data2 & 0x04) << 6) - | ((unsigned short) (cr_data2 & 0x80) << 2) - | ((unsigned short) (sr_data & 0x08) << 7); + VRS = (cr_data & 0xff) | ((unsigned short)(cr_data2 & 0x04) << 6) + | ((unsigned short)(cr_data2 & 0x80) << 2) + | ((unsigned short)(sr_data & 0x08) << 7); F = VRS + 1 - VDE; cr_data = XGI_CRT1Table[index].CR[13]; /* Vertical blank end */ - VBE = (cr_data & 0xff) | ((unsigned short) (sr_data & 0x10) << 4); + VBE = (cr_data & 0xff) | ((unsigned short)(sr_data & 0x10) << 4); temp = VBE - ((VDE - 1) & 511); B = (temp > 0) ? temp : (temp + 512); @@ -945,7 +945,7 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive, if (var->pixclock) { drate = 10 / var->pixclock; hrate = (drate * 1000) / htotal; - xgifb_info->refresh_rate = (unsigned int) (hrate * 2 + xgifb_info->refresh_rate = (unsigned int)(hrate * 2 / vtotal); } else { xgifb_info->refresh_rate = 60; @@ -1150,7 +1150,7 @@ static int XGIfb_setcolreg(unsigned int regno, unsigned int red, } break; case 16: - ((u32 *) (info->pseudo_palette))[regno] = ((red & 0xf800)) + ((u32 *)(info->pseudo_palette))[regno] = ((red & 0xf800)) | ((green & 0xfc00) >> 5) | ((blue & 0xf800) >> 11); break; @@ -1158,7 +1158,7 @@ static int XGIfb_setcolreg(unsigned int regno, unsigned int red, red >>= 8; green >>= 8; blue >>= 8; - ((u32 *) (info->pseudo_palette))[regno] = (red << 16) | (green + ((u32 *)(info->pseudo_palette))[regno] = (red << 16) | (green << 8) | (blue); break; } @@ -1250,7 +1250,7 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) drate = 10 / var->pixclock; hrate = (drate * 1000) / htotal; xgifb_info->refresh_rate = - (unsigned int) (hrate * 2 / vtotal); + (unsigned int)(hrate * 2 / vtotal); pr_debug( "%s: pixclock = %d ,htotal=%d, vtotal=%d\n" "%s: drate=%d, hrate=%d, refresh_rate=%d\n", @@ -1670,7 +1670,7 @@ static int xgifb_probe(struct pci_dev *pdev, xgifb_info->mmio_size = pci_resource_len(pdev, 1); xgifb_info->vga_base = pci_resource_start(pdev, 2) + 0x30; dev_info(>dev, "Relocate IO address: %Lx [%08lx]\n", -(u64) pci_resource_start(pdev, 2), +(u64)pci_resource_start(pdev, 2),
[PATCH v2 3/7] staging: xgifb: XGI_main_26.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/xgifb/XGI_main_26.c | 20 +--- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 51b1194..9218c74 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -231,11 +231,11 @@ static int XGIfb_GetXG21DefaultLVDSModeIdx(struct xgifb_video_info *xgifb_info) { int i = 0; - while ((XGIbios_mode[i].mode_no != 0) - && (XGIbios_mode[i].xres <= xgifb_info->lvds_data.LVDSHDE)) { - if ((XGIbios_mode[i].xres == xgifb_info->lvds_data.LVDSHDE) - && (XGIbios_mode[i].yres == xgifb_info->lvds_data.LVDSVDE) - && (XGIbios_mode[i].bpp == 8)) { + while ((XGIbios_mode[i].mode_no != 0) && + (XGIbios_mode[i].xres <= xgifb_info->lvds_data.LVDSHDE)) { + if ((XGIbios_mode[i].xres == xgifb_info->lvds_data.LVDSHDE) && + (XGIbios_mode[i].yres == xgifb_info->lvds_data.LVDSVDE) && + (XGIbios_mode[i].bpp == 8)) { return i; } i++; @@ -384,9 +384,8 @@ static int XGIfb_validate_mode(struct xgifb_video_info *xgifb_info, int myindex) return -1; break; case 640: - if ((XGIbios_mode[myindex].yres != 400) - && (XGIbios_mode[myindex].yres - != 480)) + if ((XGIbios_mode[myindex].yres != 400) && + (XGIbios_mode[myindex].yres != 480)) return -1; break; case 800: @@ -1344,9 +1343,8 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var, if (var->vmode & FB_VMODE_YWRAP) { if (var->yoffset >= info->var.yres_virtual || var->xoffset) return -EINVAL; - } else if (var->xoffset + info->var.xres > info->var.xres_virtual - || var->yoffset + info->var.yres - > info->var.yres_virtual) { + } else if (var->xoffset + info->var.xres > info->var.xres_virtual || + var->yoffset + info->var.yres > info->var.yres_virtual) { return -EINVAL; } err = XGIfb_pan_var(var, info); -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/3] staging: xgifb: vb_init.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/xgifb/vb_init.c | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 55978c1..254d5a9 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -199,7 +199,8 @@ static void XGINew_DDRII_Bootup_XG27( } static void XGINew_DDR2_MRS_XG20(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long P3c4, struct vb_device_info *pVBInfo) +unsigned long P3c4, +struct vb_device_info *pVBInfo) { unsigned long P3d4 = P3c4 + 0x10; @@ -387,7 +388,7 @@ static void XGINew_DDR2_DefaultRegister( } static void XGI_SetDRAM_Helper(unsigned long P3d4, u8 seed, u8 temp2, u8 reg, - u8 shift_factor, u8 mask1, u8 mask2) + u8 shift_factor, u8 mask1, u8 mask2) { u8 j; @@ -460,15 +461,15 @@ static void XGINew_SetDRAMDefaultRegister340( for (j = 0; j <= 6; j++) /* CR90 - CR96 */ xgifb_reg_set(P3d4, (0x90 + j), - pVBInfo->CR40[14 + j][pVBInfo->ram_type]); + pVBInfo->CR40[14 + j][pVBInfo->ram_type]); for (j = 0; j <= 2; j++) /* CRC3 - CRC5 */ xgifb_reg_set(P3d4, (0xC3 + j), - pVBInfo->CR40[21 + j][pVBInfo->ram_type]); + pVBInfo->CR40[21 + j][pVBInfo->ram_type]); for (j = 0; j < 2; j++) /* CR8A - CR8B */ xgifb_reg_set(P3d4, (0x8A + j), - pVBInfo->CR40[1 + j][pVBInfo->ram_type]); + pVBInfo->CR40[1 + j][pVBInfo->ram_type]); if (HwDeviceExtension->jChipType == XG42) xgifb_reg_set(P3d4, 0x8C, 0x87); @@ -539,7 +540,8 @@ static unsigned short XGINew_SetDRAMSize20Reg( } static int XGINew_ReadWriteRest(unsigned short StopAddr, - unsigned short StartAddr, struct vb_device_info *pVBInfo) + unsigned short StartAddr, + struct vb_device_info *pVBInfo) { int i; unsigned long Position = 0; @@ -583,7 +585,7 @@ static unsigned char XGINew_CheckFrequence(struct vb_device_info *pVBInfo) } static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, - struct vb_device_info *pVBInfo) + struct vb_device_info *pVBInfo) { unsigned char data; @@ -785,7 +787,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, } static int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension, - struct vb_device_info *pVBInfo) + struct vb_device_info *pVBInfo) { u8 i, size; unsigned short memsize, start_addr; @@ -827,8 +829,8 @@ static int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension, } static void XGINew_SetDRAMSize_340(struct xgifb_video_info *xgifb_info, - struct xgi_hw_device_info *HwDeviceExtension, - struct vb_device_info *pVBInfo) + struct xgi_hw_device_info *HwDeviceExtension, + struct vb_device_info *pVBInfo) { unsigned short data; @@ -1086,7 +1088,7 @@ static unsigned short XGINew_SenseLCD(struct xgi_hw_device_info } static void XGINew_GetXG21Sense(struct pci_dev *pdev, - struct vb_device_info *pVBInfo) + struct vb_device_info *pVBInfo) { struct xgifb_video_info *xgifb_info = pci_get_drvdata(pdev); unsigned char Temp; -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/3] staging: xgifb: vb_init.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/xgifb/vb_init.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 062ece2..55978c1 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -1039,8 +1039,9 @@ static void XGINew_SetModeScratch(struct vb_device_info *pVBInfo) } tempcl |= SetSimuScanMode; - if ((!(temp & ActiveCRT1)) && ((temp & ActiveLCD) || (temp & ActiveTV) - || (temp & ActiveCRT2))) + if ((!(temp & ActiveCRT1)) && ((temp & ActiveLCD) || + (temp & ActiveTV) || + (temp & ActiveCRT2))) tempcl ^= (SetSimuScanMode | SwitchCRT2); if ((temp & ActiveLCD) && (temp & ActiveTV)) tempcl ^= (SetSimuScanMode | SwitchCRT2); -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 3/3] staging: xgifb: vb_init.c Comment style
Make various comment style modifications. Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 makes changes to correct for email format patch submission drivers/staging/xgifb/vb_init.c | 27 ++- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 254d5a9..14af157 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -55,8 +55,9 @@ XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension, xgifb_reg_or(pVBInfo->P3d4, 0x4A, 0x80); /* Enable GPIOH read */ /* GPIOF 0:DVI 1:DVO */ data = xgifb_reg_get(pVBInfo->P3d4, 0x48); - /* HOTPLUG_SUPPORT */ - /* for current XG20 & XG21, GPIOH is floating, driver will + /* +* HOTPLUG_SUPPORT +* for current XG20 & XG21, GPIOH is floating, driver will * fix DDR temporarily */ /* DVI read GPIOH */ @@ -354,8 +355,8 @@ static void XGINew_DDR2_DefaultRegister( unsigned long Port, struct vb_device_info *pVBInfo) { unsigned long P3d4 = Port, P3c4 = Port - 0x10; - - /* keep following setting sequence, each setting in + /* +* keep following setting sequence, each setting in * the same reg insert idle */ xgifb_reg_set(P3d4, 0x82, 0x77); @@ -649,7 +650,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, pVBInfo->ram_bus = 16; /* 16 bits */ /* (0x31:12x8x2) 22bit + 2 rank */ xgifb_reg_set(pVBInfo->P3c4, 0x13, 0xB1); - /* 0x41:16Mx16 bit*/ + /* 0x41:16Mx16 bit */ xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x41); usleep_range(15, 1015); @@ -662,7 +663,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, xgifb_reg_set(pVBInfo->P3c4, 0x13, 0x31); - /* 0x31:8Mx16 bit*/ + /* 0x31:8Mx16 bit */ xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x31); @@ -680,7 +681,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, pVBInfo->ram_bus = 8; /* 8 bits */ /* (0x31:12x8x2) 22bit + 2 rank */ xgifb_reg_set(pVBInfo->P3c4, 0x13, 0xB1); - /* 0x30:8Mx8 bit*/ + /* 0x30:8Mx8 bit */ xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x30); usleep_range(15, 1015); @@ -699,7 +700,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, case XG27: pVBInfo->ram_bus = 16; /* 16 bits */ pVBInfo->ram_channel = 1; /* Single channel */ - xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x51); /* 32Mx16 bit*/ + xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x51); /* 32Mx16 bit */ break; case XG42: /* @@ -907,9 +908,9 @@ static bool xgifb_read_vbios(struct pci_dev *pdev) goto error; if (j == 0xff) j = 1; - /* -* Read the LVDS table index scratch register set by the BIOS. -*/ + + /* Read the LVDS table index scratch register set by the BIOS. */ + entry = xgifb_reg_get(xgifb_info->dev_info.P3d4, 0x36); if (entry >= j) entry = 0; @@ -1098,7 +1099,7 @@ static void XGINew_GetXG21Sense(struct pci_dev *pdev, /* LVDS on chip */ xgifb_reg_and_or(pVBInfo->P3d4, 0x38, ~0xE0, 0xC0); } else { - /* Enable GPIOA/B read */ + /* Enable GPIOA/B read */ xgifb_reg_and_or(pVBInfo->P3d4, 0x4A, ~0x03, 0x03); Temp = xgifb_reg_get(pVBInfo->P3d4, 0x48) & 0xC0; if (Temp == 0xC0) { /* DVI & DVO GPIOA/B pull high */ @@ -1122,7 +1123,7 @@ static void XGINew_GetXG27Sense(struct vb_device_info *pVBInfo) unsigned char Temp, bCR4A; bCR4A = xgifb_reg_get(pVBInfo->P3d4, 0x4A); - /* Enable GPIOA/B/C read */ + /* Enable GPIOA/B/C read */ xgifb_reg_and_or(pVBInfo->P3d4, 0x4A, ~0x07, 0x07); Temp = xgifb_reg_get(pVBI
[PATCH v2 0/3] staging: xgifb: vb_init.c checkpatch modifications
Make Linux kernel coding style modifications for vb_init.c to include: CHECK: Logical continuations should be on the previous line CHECK: Alignment should match open parenthesis Various comment style modifications Walt Feasel (3): staging: xgifb: vb_init.c Logical continuation staging: xgifb: vb_init.c Align parenthesis staging: xgifb: vb_init.c Comment style modifications drivers/staging/xgifb/vb_init.c | 56 ++--- 1 file changed, 30 insertions(+), 26 deletions(-) -- v2 makes changes to correct for email format patch submission 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: Patch procedure
On Tue, Nov 15, 2016 at 08:55:11AM +, Ioana Ciornei wrote: > > > -Original Message- > > From: linux-kernel-ow...@vger.kernel.org [mailto:linux-kernel- > > ow...@vger.kernel.org] On Behalf Of feas > > Sent: Monday, November 14, 2016 7:16 PM > > To: de...@driverdev.osuosl.org; gre...@linuxfoundation.org; linux- > > ker...@vger.kernel.org > > Subject: Patch procedure > > > > > > I know you mentioned the kernel newbies page but just in case you missed this > toturial, here is a link https://kernelnewbies.org/FirstKernelPatch. It has > all the necessary info for you to submit a proper patch set. > > Ioana C Ioana, Thank you for the link! I had read that but I think this one has fixed what I was missing. It has me sending multiple patches together in one email vs sending them individualy like I was doing. At least I hope the last one I sent is correct. https://burzalodowa.wordpress.com/ Walt ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/2] staging: xgifb: vb_table.h Blank line after declarations
Make suggested modification from checkpatch in reference to: CHECK: Please use a blank line after function/struct/union/enum declarations Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 corrects mailing format to link patches and change subject line drivers/staging/xgifb/vb_table.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h index c801deb..f2fabb8 100644 --- a/drivers/staging/xgifb/vb_table.h +++ b/drivers/staging/xgifb/vb_table.h @@ -1701,6 +1701,7 @@ static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_Vx75[] = { { {0x28, 0xF5, 0x00, 0x84, 0xFF, 0x29, 0x90} },/* ; 04 (x768) */ { {0x28, 0x5A, 0x13, 0x87, 0xFF, 0x29, 0xA9} } /* ; 05 (x1024) */ }; + /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */ static const struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_Hx75[] = { { {0x7E, 0x3B, 0x9A, 0x44, 0x12, 0x00, 0x01, 0x00} },/* ; 00 (320x) */ -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/2] staging: xgifb: vb_table.h Preferred space around
Make suggested modification from checkpatch in reference to: CHECK: spaces preferred around that '+' Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- v2 corrects mailing format to link patches and change subject line drivers/staging/xgifb/vb_table.h | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h index f2fabb8..f9f98e0 100644 --- a/drivers/staging/xgifb/vb_table.h +++ b/drivers/staging/xgifb/vb_table.h @@ -1887,17 +1887,17 @@ static const struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = { 0x6C, 0xC3, 0x35, 0x62, 0x0A, 0xC0, 0x28, 0x10}, /* LCDCap1280x1024 */ - {Panel_1280x1024, XGI_LCDDualLink+DefaultLCDCap, + {Panel_1280x1024, XGI_LCDDualLink + DefaultLCDCap, 0x70, 0x03, VCLK108_2_315, 0x70, 0x44, 0xF8, 0x2F, 0x0A, 0xC0, 0x30, 0x10}, /* LCDCap1400x1050 */ - {Panel_1400x1050, XGI_LCDDualLink+DefaultLCDCap, + {Panel_1400x1050, XGI_LCDDualLink + DefaultLCDCap, 0x70, 0x03, VCLK108_2_315, 0x70, 0x44, 0xF8, 0x2F, 0x0A, 0xC0, 0x30, 0x10}, /* LCDCap1600x1200 */ - {Panel_1600x1200, XGI_LCDDualLink+DefaultLCDCap, + {Panel_1600x1200, XGI_LCDDualLink + DefaultLCDCap, 0xC0, 0x03, VCLK162, 0x43, 0x22, 0x70, 0x24, 0x0A, 0xC0, 0x30, 0x10}, @@ -1906,7 +1906,7 @@ static const struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = { 0x2B, 0x61, 0x2B, 0x61, 0x0A, 0xC0, 0x28, 0x10}, /* LCDCap1280x1024x75 */ - {Panel_1280x1024x75, XGI_LCDDualLink+DefaultLCDCap, + {Panel_1280x1024x75, XGI_LCDDualLink + DefaultLCDCap, 0x90, 0x03, VCLK135_5, 0x54, 0x42, 0x4A, 0x61, 0x0A, 0xC0, 0x30, 0x10}, -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/2] Style edits for xgifb: vb_table.h
Corrects style issues 'Blank line after declarations' and 'Preferred space around operators' Walt Feasel (2): [STYLE 1/2]staging:xgifb:vb_table.h Blank line after declarations [STYLE 2/2]staging:xgifb:vb_table.h Preferred space around drivers/staging/xgifb/vb_table.h | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) -- v2 corrects mailing format to link patches and change subject line 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] [STYLE]staging:xgifb:XGI_main.h Align columns
Make alignment changes to tabular data for consistency Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- drivers/staging/xgifb/XGI_main.h | 52 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 85079fe..c1e0b6b 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -174,7 +174,7 @@ static const struct _XGI_tvtype { {"NTSC",2}, {"pal", 1}, {"ntsc",2}, - {"\0", -1} + {"\0", -1} }; static const struct _XGI_vrate { @@ -183,44 +183,44 @@ static const struct _XGI_vrate { u16 yres; u16 refresh; } XGIfb_vrate[] = { - {1, 640, 480, 60}, {2, 640, 480, 72}, - {3, 640, 480, 75}, {4, 640, 480, 85}, + {1, 640, 480, 60}, {2, 640, 480, 72}, + {3, 640, 480, 75}, {4, 640, 480, 85}, - {5, 640, 480, 100}, {6, 640, 480, 120}, - {7, 640, 480, 160}, {8, 640, 480, 200}, + {5, 640, 480, 100}, {6, 640, 480, 120}, + {7, 640, 480, 160}, {8, 640, 480, 200}, - {1, 720, 480, 60}, - {1, 720, 576, 58}, - {1, 800, 480, 60}, {2, 800, 480, 75}, {3, 800, 480, 85}, - {1, 800, 600, 60}, {2, 800, 600, 72}, {3, 800, 600, 75}, - {4, 800, 600, 85}, {5, 800, 600, 100}, - {6, 800, 600, 120}, {7, 800, 600, 160}, + {1, 720, 480, 60}, + {1, 720, 576, 58}, + {1, 800, 480, 60}, {2, 800, 480, 75}, {3, 800, 480, 85}, + {1, 800, 600, 60}, {2, 800, 600, 72}, {3, 800, 600, 75}, + {4, 800, 600, 85}, {5, 800, 600, 100}, + {6, 800, 600, 120}, {7, 800, 600, 160}, {1, 1024, 768, 60}, {2, 1024, 768, 70}, {3, 1024, 768, 75}, - {4, 1024, 768, 85}, {5, 1024, 768, 100}, {6, 1024, 768, 120}, - {1, 1024, 576, 60}, {2, 1024, 576, 75}, {3, 1024, 576, 85}, - {1, 1024, 600, 60}, - {1, 1152, 768, 60}, - {1, 1280, 720, 60}, {2, 1280, 720, 75}, {3, 1280, 720, 85}, - {1, 1280, 768, 60}, + {4, 1024, 768, 85}, {5, 1024, 768, 100}, {6, 1024, 768, 120}, + {1, 1024, 576, 60}, {2, 1024, 576, 75}, {3, 1024, 576, 85}, + {1, 1024, 600, 60}, + {1, 1152, 768, 60}, + {1, 1280, 720, 60}, {2, 1280, 720, 75}, {3, 1280, 720, 85}, + {1, 1280, 768, 60}, {1, 1280, 1024, 60}, {2, 1280, 1024, 75}, {3, 1280, 1024, 85}, - {1, 1280, 960, 70}, - {1, 1400, 1050, 60}, - {1, 1600, 1200, 60}, {2, 1600, 1200, 65}, + {1, 1280, 960, 70}, + {1, 1400, 1050, 60}, + {1, 1600, 1200, 60}, {2, 1600, 1200, 65}, {3, 1600, 1200, 70}, {4, 1600, 1200, 75}, - {5, 1600, 1200, 85}, {6, 1600, 1200, 100}, + {5, 1600, 1200, 85}, {6, 1600, 1200, 100}, {7, 1600, 1200, 120}, - {1, 1920, 1440, 60}, {2, 1920, 1440, 65}, + {1, 1920, 1440, 60}, {2, 1920, 1440, 65}, {3, 1920, 1440, 70}, {4, 1920, 1440, 75}, - {5, 1920, 1440, 85}, {6, 1920, 1440, 100}, - {1, 2048, 1536, 60}, {2, 2048, 1536, 65}, + {5, 1920, 1440, 85}, {6, 1920, 1440, 100}, + {1, 2048, 1536, 60}, {2, 2048, 1536, 65}, {3, 2048, 1536, 70}, {4, 2048, 1536, 75}, - {5, 2048, 1536, 85}, - {0, 0, 0, 0} + {5, 2048, 1536, 85}, + {0,0,0, 0} }; static const struct _XGI_TV_filter { -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] [STYLE 9/9]staging:xgifb:XGI_main_26.c Align on parenthesis
Make suggested modification from checkpatch in reference to: CHECK: Alignment should match open parenthesis Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- drivers/staging/xgifb/XGI_main_26.c | 37 - 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 96936e3..05ff19a 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -1616,8 +1616,7 @@ static int __init XGIfb_setup(char *options) return 0; } -static int xgifb_probe(struct pci_dev *pdev, - const struct pci_device_id *ent) +static int xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { u8 reg, reg1; u8 CR48, CR38; @@ -1722,7 +1721,7 @@ static int xgifb_probe(struct pci_dev *pdev, xgifb_info->video_size, "XGIfb FB")) { dev_err(>dev, "Unable request memory size %x\n", - xgifb_info->video_size); + xgifb_info->video_size); dev_err(>dev, "Fatal error: Unable to reserve frame buffer memory. Is there another framebuffer driver active?\n"); ret = -ENODEV; @@ -1885,8 +1884,7 @@ static int xgifb_probe(struct pci_dev *pdev, xgifb_info->refresh_rate = refresh_rate; if (xgifb_info->refresh_rate == 0) xgifb_info->refresh_rate = 60; - if (XGIfb_search_refresh_rate(xgifb_info, - xgifb_info->refresh_rate) == 0) { + if (XGIfb_search_refresh_rate(xgifb_info, xgifb_info->refresh_rate) == 0) { xgifb_info->rate_idx = 1; xgifb_info->refresh_rate = 60; } @@ -1920,16 +1918,13 @@ static int xgifb_probe(struct pci_dev *pdev, break; default: xgifb_info->video_cmap_len = 16; - pr_info("Unsupported depth %d\n", - xgifb_info->video_bpp); + pr_info("Unsupported depth %d\n", xgifb_info->video_bpp); break; } - pr_info("Default mode is %dx%dx%d (%dHz)\n", - xgifb_info->video_width, - xgifb_info->video_height, - xgifb_info->video_bpp, - xgifb_info->refresh_rate); + pr_info("Default mode is %dx%dx%d (%dHz)\n", xgifb_info->video_width, + xgifb_info->video_height, xgifb_info->video_bpp, + xgifb_info->refresh_rate); fb_info->var.red.length = 8; fb_info->var.green.length = 8; @@ -1952,15 +1947,15 @@ static int xgifb_probe(struct pci_dev *pdev, XGIbios_mode[xgifb_info->mode_idx].mode_no)); if (XGIfb_mode_rate_to_ddata(_info->dev_info, hw_info, - XGIbios_mode[xgifb_info->mode_idx].mode_no, - _info->var.left_margin, - _info->var.right_margin, - _info->var.upper_margin, - _info->var.lower_margin, - _info->var.hsync_len, - _info->var.vsync_len, - _info->var.sync, - _info->var.vmode)) { +XGIbios_mode[xgifb_info->mode_idx].mode_no, +_info->var.left_margin, +_info->var.right_margin, +_info->var.upper_margin, +_info->var.lower_margin, +_info->var.hsync_len, +_info->var.vsync_len, +_info->var.sync, +_info->var.vmode)) { if ((fb_info->var.vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) { fb_info->var.yres <<= 1; -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] [STYLE 8/9]staging:xgifb:XGI_main_26.c Align on parenthesis
Make suggested modification from checkpatch in reference to: CHECK: Alignment should match open parenthesis Signed-off-by: Walt Feasel <waltfea...@gmail.com> --- drivers/staging/xgifb/XGI_main_26.c | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 34fc5ce..96936e3 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -1156,7 +1156,7 @@ static int XGIfb_setcolreg(unsigned int regno, unsigned int red, /* --- FBDev related routines for all series -- */ static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con, - struct fb_info *info) +struct fb_info *info) { struct xgifb_video_info *xgifb_info = info->par; @@ -1250,10 +1250,10 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) search_idx = 0; while ((XGIbios_mode[search_idx].mode_no != 0) && - (XGIbios_mode[search_idx].xres <= var->xres)) { + (XGIbios_mode[search_idx].xres <= var->xres)) { if ((XGIbios_mode[search_idx].xres == var->xres) && - (XGIbios_mode[search_idx].yres == var->yres) && - (XGIbios_mode[search_idx].bpp == var->bits_per_pixel)) { + (XGIbios_mode[search_idx].yres == var->yres) && + (XGIbios_mode[search_idx].bpp == var->bits_per_pixel)) { if (XGIfb_validate_mode(xgifb_info, search_idx) > 0) { found_mode = 1; break; @@ -1263,8 +1263,8 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) } if (!found_mode) { - pr_err("%dx%dx%d is no valid mode\n", - var->xres, var->yres, var->bits_per_pixel); + pr_err("%dx%dx%d is no valid mode\n", var->xres, var->yres, + var->bits_per_pixel); search_idx = 0; while (XGIbios_mode[search_idx].mode_no != 0) { if ((var->xres <= XGIbios_mode[search_idx].xres) && @@ -1282,12 +1282,12 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) if (found_mode) { var->xres = XGIbios_mode[search_idx].xres; var->yres = XGIbios_mode[search_idx].yres; - pr_debug("Adapted to mode %dx%dx%d\n", - var->xres, var->yres, var->bits_per_pixel); + pr_debug("Adapted to mode %dx%dx%d\n", var->xres, +var->yres, var->bits_per_pixel); } else { pr_err("Failed to find similar mode to %dx%dx%d\n", - var->xres, var->yres, var->bits_per_pixel); + var->xres, var->yres, var->bits_per_pixel); return -EINVAL; } } @@ -1318,8 +1318,7 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) return 0; } -static int XGIfb_pan_display(struct fb_var_screeninfo *var, - struct fb_info *info) +static int XGIfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) { int err; @@ -1459,7 +1458,7 @@ static int XGIfb_get_dram_size(struct xgifb_video_info *xgifb_info) xgifb_info->video_size = xgifb_info->video_size * ChannelNum; pr_info("SR14=%x DramSzie %x ChannelNum %x\n", - reg, + reg, xgifb_info->video_size, ChannelNum); return 0; } -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel