Re: [PATCH v2] staging: speakup: Fix warning of line over 80 characters.
On Sat, Feb 07, 2015 at 06:34:39PM -0800, shirish gajera wrote: > On Sat, Feb 7, 2015 at 4:33 PM, Greg KH wrote: > > On Sat, Feb 07, 2015 at 09:46:37AM -0800, shirish gajera wrote: > > On Sat, Feb 7, 2015 at 1:09 AM, Greg KH > wrote: > > > > On Sat, Jan 31, 2015 at 02:19:43PM -0800, Shirish Gajera wrote: > > > This patch fixes the checkpatch.pl warning: > > > > > > WARNING: line over 80 characters > > > > > > All line over 80 characters in driver/staging/speakup/* are fixed. > > > Aditional changes suggest by mailing list are also fixed. > > > > > > Signed-off-by: Shirish Gajera > > > --- > > > drivers/staging/speakup/main.c | 12 > > > drivers/staging/speakup/serialio.h | 3 ++- > > > drivers/staging/speakup/speakup.h | 6 -- > > > drivers/staging/speakup/speakup_decext.c | 6 -- > > > drivers/staging/speakup/speakup_decpc.c | 6 -- > > > drivers/staging/speakup/spk_priv.h | 3 ++- > > > drivers/staging/speakup/spk_types.h | 3 ++- > > > drivers/staging/speakup/synth.c | 10 +- > > > 8 files changed, 31 insertions(+), 18 deletions(-) > > > > This fails to apply to my tree for some reason :( > > > > Can you refresh it and resend? > > > > thanks, > > > > greg k-h > > > > > > > > It is already refreshed from last time. > > > > Can you clarify refresh means git pull and resend right ? Is there any > other > > way of refresh ? > > Yes it does. What tree and branch are you making these against? They > should be against my staging.git tree on git.kernel.org, and against the > staging-testing branch. Anything else might have conflicts. > > thanks, > > greg k-h > > > I clone this directory git clone -b staging-next git://git.kernel.org/pub/scm/ > linux/kernel/git/gregkh/staging.git So, I am hoping it's pointing to your > tree. Yes it is. > I still didn't understand what staging-testing branch is ? Also I can check if > there is some conflicts. I check this one http:// > driverdev.linuxdriverproject.org/pipermail/driverdev-devel/ for january and > February I don't see any conflicts. > > Can you elaborate more why it's failing ? I can't dig through your web link, but if you don't know about git branches, then odds are you are making this against the wrong set of code. Read up some tutorials on git that describe how to work with branches, that should help out. A short example of what to do might be: git clone -b staging-next git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git cd staging git checkout -t -b staging-testing origin/staging-testing git chekout -b work that will create a local branch called "staging-testing" that will track my upstream staging-testing, and a local branch for you to work on called "work". Then diff between work and staging-testing and you should be all set. Hope this helps, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] staging: speakup: Fix warning of line over 80 characters.
On Sat, Feb 07, 2015 at 09:46:37AM -0800, shirish gajera wrote: > On Sat, Feb 7, 2015 at 1:09 AM, Greg KH wrote: > > On Sat, Jan 31, 2015 at 02:19:43PM -0800, Shirish Gajera wrote: > > This patch fixes the checkpatch.pl warning: > > > > WARNING: line over 80 characters > > > > All line over 80 characters in driver/staging/speakup/* are fixed. > > Aditional changes suggest by mailing list are also fixed. > > > > Signed-off-by: Shirish Gajera > > --- > > drivers/staging/speakup/main.c | 12 > > drivers/staging/speakup/serialio.h | 3 ++- > > drivers/staging/speakup/speakup.h | 6 -- > > drivers/staging/speakup/speakup_decext.c | 6 -- > > drivers/staging/speakup/speakup_decpc.c | 6 -- > > drivers/staging/speakup/spk_priv.h | 3 ++- > > drivers/staging/speakup/spk_types.h | 3 ++- > > drivers/staging/speakup/synth.c | 10 +- > > 8 files changed, 31 insertions(+), 18 deletions(-) > > This fails to apply to my tree for some reason :( > > Can you refresh it and resend? > > thanks, > > greg k-h > > > > It is already refreshed from last time. > > Can you clarify refresh means git pull and resend right ? Is there any other > way of refresh ? Yes it does. What tree and branch are you making these against? They should be against my staging.git tree on git.kernel.org, and against the staging-testing branch. Anything else might have conflicts. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] staging: speakup: Fix warning of line over 80 characters.
On Sat, Jan 31, 2015 at 02:19:43PM -0800, Shirish Gajera wrote: > This patch fixes the checkpatch.pl warning: > > WARNING: line over 80 characters > > All line over 80 characters in driver/staging/speakup/* are fixed. > Aditional changes suggest by mailing list are also fixed. > > Signed-off-by: Shirish Gajera > --- > drivers/staging/speakup/main.c | 12 > drivers/staging/speakup/serialio.h | 3 ++- > drivers/staging/speakup/speakup.h| 6 -- > drivers/staging/speakup/speakup_decext.c | 6 -- > drivers/staging/speakup/speakup_decpc.c | 6 -- > drivers/staging/speakup/spk_priv.h | 3 ++- > drivers/staging/speakup/spk_types.h | 3 ++- > drivers/staging/speakup/synth.c | 10 +- > 8 files changed, 31 insertions(+), 18 deletions(-) This fails to apply to my tree for some reason :( Can you refresh it and resend? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] staging: speakup: Fix warning of line over 80 characters.
On Sat, Jan 31, 2015 at 02:19:43PM -0800, Shirish Gajera wrote: This patch fixes the checkpatch.pl warning: WARNING: line over 80 characters All line over 80 characters in driver/staging/speakup/* are fixed. Aditional changes suggest by mailing list are also fixed. Signed-off-by: Shirish Gajera gajerashir...@gmail.com --- drivers/staging/speakup/main.c | 12 drivers/staging/speakup/serialio.h | 3 ++- drivers/staging/speakup/speakup.h| 6 -- drivers/staging/speakup/speakup_decext.c | 6 -- drivers/staging/speakup/speakup_decpc.c | 6 -- drivers/staging/speakup/spk_priv.h | 3 ++- drivers/staging/speakup/spk_types.h | 3 ++- drivers/staging/speakup/synth.c | 10 +- 8 files changed, 31 insertions(+), 18 deletions(-) This fails to apply to my tree for some reason :( Can you refresh it and resend? thanks, greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] staging: speakup: Fix warning of line over 80 characters.
On Sat, Feb 07, 2015 at 09:46:37AM -0800, shirish gajera wrote: On Sat, Feb 7, 2015 at 1:09 AM, Greg KH gre...@linuxfoundation.org wrote: On Sat, Jan 31, 2015 at 02:19:43PM -0800, Shirish Gajera wrote: This patch fixes the checkpatch.pl warning: WARNING: line over 80 characters All line over 80 characters in driver/staging/speakup/* are fixed. Aditional changes suggest by mailing list are also fixed. Signed-off-by: Shirish Gajera gajerashir...@gmail.com --- drivers/staging/speakup/main.c | 12 drivers/staging/speakup/serialio.h | 3 ++- drivers/staging/speakup/speakup.h | 6 -- drivers/staging/speakup/speakup_decext.c | 6 -- drivers/staging/speakup/speakup_decpc.c | 6 -- drivers/staging/speakup/spk_priv.h | 3 ++- drivers/staging/speakup/spk_types.h | 3 ++- drivers/staging/speakup/synth.c | 10 +- 8 files changed, 31 insertions(+), 18 deletions(-) This fails to apply to my tree for some reason :( Can you refresh it and resend? thanks, greg k-h It is already refreshed from last time. Can you clarify refresh means git pull and resend right ? Is there any other way of refresh ? Yes it does. What tree and branch are you making these against? They should be against my staging.git tree on git.kernel.org, and against the staging-testing branch. Anything else might have conflicts. thanks, greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2] staging: speakup: Fix warning of line over 80 characters.
On Sat, Feb 07, 2015 at 06:34:39PM -0800, shirish gajera wrote: On Sat, Feb 7, 2015 at 4:33 PM, Greg KH gre...@linuxfoundation.org wrote: On Sat, Feb 07, 2015 at 09:46:37AM -0800, shirish gajera wrote: On Sat, Feb 7, 2015 at 1:09 AM, Greg KH gre...@linuxfoundation.org wrote: On Sat, Jan 31, 2015 at 02:19:43PM -0800, Shirish Gajera wrote: This patch fixes the checkpatch.pl warning: WARNING: line over 80 characters All line over 80 characters in driver/staging/speakup/* are fixed. Aditional changes suggest by mailing list are also fixed. Signed-off-by: Shirish Gajera gajerashir...@gmail.com --- drivers/staging/speakup/main.c | 12 drivers/staging/speakup/serialio.h | 3 ++- drivers/staging/speakup/speakup.h | 6 -- drivers/staging/speakup/speakup_decext.c | 6 -- drivers/staging/speakup/speakup_decpc.c | 6 -- drivers/staging/speakup/spk_priv.h | 3 ++- drivers/staging/speakup/spk_types.h | 3 ++- drivers/staging/speakup/synth.c | 10 +- 8 files changed, 31 insertions(+), 18 deletions(-) This fails to apply to my tree for some reason :( Can you refresh it and resend? thanks, greg k-h It is already refreshed from last time. Can you clarify refresh means git pull and resend right ? Is there any other way of refresh ? Yes it does. What tree and branch are you making these against? They should be against my staging.git tree on git.kernel.org, and against the staging-testing branch. Anything else might have conflicts. thanks, greg k-h I clone this directory git clone -b staging-next git://git.kernel.org/pub/scm/ linux/kernel/git/gregkh/staging.git So, I am hoping it's pointing to your tree. Yes it is. I still didn't understand what staging-testing branch is ? Also I can check if there is some conflicts. I check this one http:// driverdev.linuxdriverproject.org/pipermail/driverdev-devel/ for january and February I don't see any conflicts. Can you elaborate more why it's failing ? I can't dig through your web link, but if you don't know about git branches, then odds are you are making this against the wrong set of code. Read up some tutorials on git that describe how to work with branches, that should help out. A short example of what to do might be: git clone -b staging-next git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git cd staging git checkout -t -b staging-testing origin/staging-testing git chekout -b work now do work that will create a local branch called staging-testing that will track my upstream staging-testing, and a local branch for you to work on called work. Then diff between work and staging-testing and you should be all set. Hope this helps, greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2] staging: speakup: Fix warning of line over 80 characters.
This patch fixes the checkpatch.pl warning:
WARNING: line over 80 characters
All line over 80 characters in driver/staging/speakup/* are fixed.
Aditional changes suggest by mailing list are also fixed.
Signed-off-by: Shirish Gajera
---
drivers/staging/speakup/main.c | 12
drivers/staging/speakup/serialio.h | 3 ++-
drivers/staging/speakup/speakup.h| 6 --
drivers/staging/speakup/speakup_decext.c | 6 --
drivers/staging/speakup/speakup_decpc.c | 6 --
drivers/staging/speakup/spk_priv.h | 3 ++-
drivers/staging/speakup/spk_types.h | 3 ++-
drivers/staging/speakup/synth.c | 10 +-
8 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index e9f0c15..4af36ca 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -422,8 +422,10 @@ static void announce_edge(struct vc_data *vc, int msg_id)
{
if (spk_bleeps & 1)
bleep(spk_y);
- if ((spk_bleeps & 2) && (msg_id < edge_quiet))
- synth_printf("%s\n", spk_msg_get(MSG_EDGE_MSGS_START + msg_id -
1));
+ if ((spk_bleeps & 2) && (msg_id < edge_quiet)) {
+ synth_printf("%s\n",
+ spk_msg_get(MSG_EDGE_MSGS_START + msg_id - 1));
+ }
}
static void speak_char(u_char ch)
@@ -1131,7 +1133,8 @@ static void spkup_write(const char *in_buf, int count)
if (in_count > 2 && rep_count > 2) {
if (last_type & CH_RPT) {
synth_printf(" ");
- synth_printf(spk_msg_get(MSG_REPEAT_DESC2),
++rep_count);
+ synth_printf(spk_msg_get(MSG_REPEAT_DESC2),
+++rep_count);
synth_printf(" ");
}
rep_count = 0;
@@ -1847,7 +1850,8 @@ static void speakup_win_set(struct vc_data *vc)
win_right = spk_x;
}
snprintf(info, sizeof(info), spk_msg_get(MSG_WINDOW_BOUNDARY),
-(win_start) ? spk_msg_get(MSG_END) :
spk_msg_get(MSG_START),
+(win_start) ? spk_msg_get(MSG_END) :
+ spk_msg_get(MSG_START),
(int)spk_y + 1, (int)spk_x + 1);
}
synth_printf("%s\n", info);
diff --git a/drivers/staging/speakup/serialio.h
b/drivers/staging/speakup/serialio.h
index 317bb84..1b39921 100644
--- a/drivers/staging/speakup/serialio.h
+++ b/drivers/staging/speakup/serialio.h
@@ -34,6 +34,7 @@ struct old_serial_port {
#define SPK_TIMEOUT 100
#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-#define spk_serial_tx_busy() ((inb(speakup_info.port_tts + UART_LSR) &
BOTH_EMPTY) != BOTH_EMPTY)
+#define spk_serial_tx_busy() \
+ ((inb(speakup_info.port_tts + UART_LSR) & BOTH_EMPTY) != BOTH_EMPTY)
#endif
diff --git a/drivers/staging/speakup/speakup.h
b/drivers/staging/speakup/speakup.h
index 898dce5..d194ebb 100644
--- a/drivers/staging/speakup/speakup.h
+++ b/drivers/staging/speakup/speakup.h
@@ -61,10 +61,12 @@ extern struct st_var_header *spk_get_var_header(enum
var_id_t var_id);
extern struct st_var_header *spk_var_header_by_name(const char *name);
extern struct punc_var_t *spk_get_punc_var(enum var_id_t var_id);
extern int spk_set_num_var(int val, struct st_var_header *var, int how);
-extern int spk_set_string_var(const char *page, struct st_var_header *var, int
len);
+extern int spk_set_string_var(const char *page, struct st_var_header *var,
+ int len);
extern int spk_set_mask_bits(const char *input, const int which, const int
how);
extern special_func spk_special_handler;
-extern int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short
key);
+extern int spk_handle_help(struct vc_data *vc, u_char type, u_char ch,
+ u_short key);
extern int synth_init(char *name);
extern void synth_release(void);
diff --git a/drivers/staging/speakup/speakup_decext.c
b/drivers/staging/speakup/speakup_decext.c
index 5550290..d86a579 100644
--- a/drivers/staging/speakup/speakup_decext.c
+++ b/drivers/staging/speakup/speakup_decext.c
@@ -207,10 +207,12 @@ static void do_catch_up(struct spk_synth *synth)
if (time_after_eq(jiffies, jiff_max)) {
if (!in_escape)
spk_serial_out(PROCSPEECH);
- spin_lock_irqsave(_info.spinlock,
flags);
+ spin_lock_irqsave(_info.spinlock,
+ flags);
jiffy_delta_val = jiffy_delta->u.n.value;
delay_time_val = delay_time->u.n.value;
- spin_unlock_irqrestore(_info.spinlock,
flags);
+
[PATCH v2] staging: speakup: Fix warning of line over 80 characters.
This patch fixes the checkpatch.pl warning:
WARNING: line over 80 characters
All line over 80 characters in driver/staging/speakup/* are fixed.
Aditional changes suggest by mailing list are also fixed.
Signed-off-by: Shirish Gajera gajerashir...@gmail.com
---
drivers/staging/speakup/main.c | 12
drivers/staging/speakup/serialio.h | 3 ++-
drivers/staging/speakup/speakup.h| 6 --
drivers/staging/speakup/speakup_decext.c | 6 --
drivers/staging/speakup/speakup_decpc.c | 6 --
drivers/staging/speakup/spk_priv.h | 3 ++-
drivers/staging/speakup/spk_types.h | 3 ++-
drivers/staging/speakup/synth.c | 10 +-
8 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index e9f0c15..4af36ca 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -422,8 +422,10 @@ static void announce_edge(struct vc_data *vc, int msg_id)
{
if (spk_bleeps 1)
bleep(spk_y);
- if ((spk_bleeps 2) (msg_id edge_quiet))
- synth_printf(%s\n, spk_msg_get(MSG_EDGE_MSGS_START + msg_id -
1));
+ if ((spk_bleeps 2) (msg_id edge_quiet)) {
+ synth_printf(%s\n,
+ spk_msg_get(MSG_EDGE_MSGS_START + msg_id - 1));
+ }
}
static void speak_char(u_char ch)
@@ -1131,7 +1133,8 @@ static void spkup_write(const char *in_buf, int count)
if (in_count 2 rep_count 2) {
if (last_type CH_RPT) {
synth_printf( );
- synth_printf(spk_msg_get(MSG_REPEAT_DESC2),
++rep_count);
+ synth_printf(spk_msg_get(MSG_REPEAT_DESC2),
+++rep_count);
synth_printf( );
}
rep_count = 0;
@@ -1847,7 +1850,8 @@ static void speakup_win_set(struct vc_data *vc)
win_right = spk_x;
}
snprintf(info, sizeof(info), spk_msg_get(MSG_WINDOW_BOUNDARY),
-(win_start) ? spk_msg_get(MSG_END) :
spk_msg_get(MSG_START),
+(win_start) ? spk_msg_get(MSG_END) :
+ spk_msg_get(MSG_START),
(int)spk_y + 1, (int)spk_x + 1);
}
synth_printf(%s\n, info);
diff --git a/drivers/staging/speakup/serialio.h
b/drivers/staging/speakup/serialio.h
index 317bb84..1b39921 100644
--- a/drivers/staging/speakup/serialio.h
+++ b/drivers/staging/speakup/serialio.h
@@ -34,6 +34,7 @@ struct old_serial_port {
#define SPK_TIMEOUT 100
#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-#define spk_serial_tx_busy() ((inb(speakup_info.port_tts + UART_LSR)
BOTH_EMPTY) != BOTH_EMPTY)
+#define spk_serial_tx_busy() \
+ ((inb(speakup_info.port_tts + UART_LSR) BOTH_EMPTY) != BOTH_EMPTY)
#endif
diff --git a/drivers/staging/speakup/speakup.h
b/drivers/staging/speakup/speakup.h
index 898dce5..d194ebb 100644
--- a/drivers/staging/speakup/speakup.h
+++ b/drivers/staging/speakup/speakup.h
@@ -61,10 +61,12 @@ extern struct st_var_header *spk_get_var_header(enum
var_id_t var_id);
extern struct st_var_header *spk_var_header_by_name(const char *name);
extern struct punc_var_t *spk_get_punc_var(enum var_id_t var_id);
extern int spk_set_num_var(int val, struct st_var_header *var, int how);
-extern int spk_set_string_var(const char *page, struct st_var_header *var, int
len);
+extern int spk_set_string_var(const char *page, struct st_var_header *var,
+ int len);
extern int spk_set_mask_bits(const char *input, const int which, const int
how);
extern special_func spk_special_handler;
-extern int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short
key);
+extern int spk_handle_help(struct vc_data *vc, u_char type, u_char ch,
+ u_short key);
extern int synth_init(char *name);
extern void synth_release(void);
diff --git a/drivers/staging/speakup/speakup_decext.c
b/drivers/staging/speakup/speakup_decext.c
index 5550290..d86a579 100644
--- a/drivers/staging/speakup/speakup_decext.c
+++ b/drivers/staging/speakup/speakup_decext.c
@@ -207,10 +207,12 @@ static void do_catch_up(struct spk_synth *synth)
if (time_after_eq(jiffies, jiff_max)) {
if (!in_escape)
spk_serial_out(PROCSPEECH);
- spin_lock_irqsave(speakup_info.spinlock,
flags);
+ spin_lock_irqsave(speakup_info.spinlock,
+ flags);
jiffy_delta_val = jiffy_delta-u.n.value;
delay_time_val = delay_time-u.n.value;
- spin_unlock_irqrestore(speakup_info.spinlock,
flags);
+
