* [PATCH] staging: speakup: Match alignment with open parenthesis.
@ 2017-03-20 1:11 Arushi Singhal
0 siblings, 0 replies; 3+ messages in thread
From: Arushi Singhal @ 2017-03-20 1:11 UTC (permalink / raw)
To: w.d.hubbs
Cc: Chris Brannon, Kirk Reiser, Samuel Thibault, Greg Kroah-Hartman,
speakup, devel, linux-kernel, outreachy-kernel
Fix checkpatch issues: "CHECK: Alignment should match open parenthesis".
Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
---
drivers/staging/speakup/main.c | 2 +-
drivers/staging/speakup/selection.c | 2 +-
drivers/staging/speakup/serialio.c | 2 +-
drivers/staging/speakup/speakup_acntpc.c | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 7568e8149613..55bf7af1d6ea 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -1160,7 +1160,7 @@ static void spkup_write(const u16 *in_buf, int count)
if (last_type & CH_RPT) {
synth_printf(" ");
synth_printf(spk_msg_get(MSG_REPEAT_DESC2),
- ++rep_count);
+ ++rep_count);
synth_printf(" ");
}
rep_count = 0;
diff --git a/drivers/staging/speakup/selection.c b/drivers/staging/speakup/selection.c
index 4417c00e68a7..08f68fc2864e 100644
--- a/drivers/staging/speakup/selection.c
+++ b/drivers/staging/speakup/selection.c
@@ -75,7 +75,7 @@ int speakup_set_selection(struct tty_struct *tty)
speakup_clear_selection();
spk_sel_cons = vc_cons[fg_console].d;
dev_warn(tty->dev,
- "Selection: mark console not the same as cut\n");
+ "Selection: mark console not the same as cut\n");
return -EINVAL;
}
diff --git a/drivers/staging/speakup/serialio.c b/drivers/staging/speakup/serialio.c
index e860e48818a4..5e31acac19de 100644
--- a/drivers/staging/speakup/serialio.c
+++ b/drivers/staging/speakup/serialio.c
@@ -125,7 +125,7 @@ static void start_serial_interrupt(int irq)
pr_err("Unable to request Speakup serial I R Q\n");
/* Set MCR */
outb(UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2,
- speakup_info.port_tts + UART_MCR);
+ speakup_info.port_tts + UART_MCR);
/* Turn on Interrupts */
outb(UART_IER_MSI|UART_IER_RLSI|UART_IER_RDI,
speakup_info.port_tts + UART_IER);
diff --git a/drivers/staging/speakup/speakup_acntpc.c b/drivers/staging/speakup/speakup_acntpc.c
index b4058bd82e42..ad72f8e883fc 100644
--- a/drivers/staging/speakup/speakup_acntpc.c
+++ b/drivers/staging/speakup/speakup_acntpc.c
@@ -261,9 +261,9 @@ static int synth_probe(struct spk_synth *synth)
if (port_forced) {
speakup_info.port_tts = port_forced;
pr_info("probe forced to %x by kernel command line\n",
- speakup_info.port_tts);
+ speakup_info.port_tts);
if (synth_request_region(speakup_info.port_tts - 1,
- SYNTH_IO_EXTENT)) {
+ SYNTH_IO_EXTENT)) {
pr_warn("sorry, port already reserved\n");
return -EBUSY;
}
@@ -272,7 +272,7 @@ static int synth_probe(struct spk_synth *synth)
} else {
for (i = 0; synth_portlist[i]; i++) {
if (synth_request_region(synth_portlist[i],
- SYNTH_IO_EXTENT)) {
+ SYNTH_IO_EXTENT)) {
pr_warn
("request_region: failed with 0x%x, %d\n",
synth_portlist[i], SYNTH_IO_EXTENT);
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] staging: speakup: match alignment with open parenthesis
2018-03-05 17:34 [PATCH] staging: speakup: match " Santha Meena Ramamoorthy
@ 2018-03-05 18:37 ` Samuel Thibault
0 siblings, 0 replies; 3+ messages in thread
From: Samuel Thibault @ 2018-03-05 18:37 UTC (permalink / raw)
To: Santha Meena Ramamoorthy; +Cc: gregkh, kirk, chris, w.d.hubbs, outreachy-kernel
Santha Meena Ramamoorthy, on lun. 05 mars 2018 09:34:13 -0800, wrote:
> Match alignment with the open parenthesis to conform to the Linux kernel
> coding style. Issue found using checkpatch.
>
> Signed-off-by: Santha Meena Ramamoorthy <santhameena13@gmail.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> ---
> drivers/staging/speakup/main.c | 2 +-
> drivers/staging/speakup/speakup_decpc.c | 6 +++---
> drivers/staging/speakup/speakup_dectlk.c | 4 ++--
> drivers/staging/speakup/speakup_keypc.c | 4 ++--
> drivers/staging/speakup/spk_ttyio.c | 2 +-
> 5 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
> index d7cdec3..af30b70 100644
> --- a/drivers/staging/speakup/main.c
> +++ b/drivers/staging/speakup/main.c
> @@ -417,7 +417,7 @@ static void announce_edge(struct vc_data *vc, int msg_id)
> 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));
> + spk_msg_get(MSG_EDGE_MSGS_START + msg_id - 1));
> }
>
> static void speak_char(u16 ch)
> diff --git a/drivers/staging/speakup/speakup_decpc.c b/drivers/staging/speakup/speakup_decpc.c
> index 303f393..6649309 100644
> --- a/drivers/staging/speakup/speakup_decpc.c
> +++ b/drivers/staging/speakup/speakup_decpc.c
> @@ -349,7 +349,7 @@ static int testkernel(void)
> return 0;
> else if (dt_stat == 0x0dec)
> pr_warn("dec_pc at 0x%x, software not loaded\n",
> - speakup_info.port_tts);
> + speakup_info.port_tts);
> status = -3;
> oops: synth_release_region(speakup_info.port_tts, SYNTH_IO_EXTENT);
> speakup_info.port_tts = 0;
> @@ -412,11 +412,11 @@ static void do_catch_up(struct spk_synth *synth)
> if (!in_escape)
> dt_sendchar(PROCSPEECH);
> spin_lock_irqsave(&speakup_info.spinlock,
> - flags);
> + flags);
> jiffy_delta_val = jiffy_delta->u.n.value;
> delay_time_val = delay_time->u.n.value;
> spin_unlock_irqrestore(&speakup_info.spinlock,
> - flags);
> + flags);
> schedule_timeout(msecs_to_jiffies
> (delay_time_val));
> jiff_max = jiffies + jiffy_delta_val;
> diff --git a/drivers/staging/speakup/speakup_dectlk.c b/drivers/staging/speakup/speakup_dectlk.c
> index 2ea22a2..a144f28 100644
> --- a/drivers/staging/speakup/speakup_dectlk.c
> +++ b/drivers/staging/speakup/speakup_dectlk.c
> @@ -262,11 +262,11 @@ static void do_catch_up(struct spk_synth *synth)
> if (!in_escape)
> synth->io_ops->synth_out(synth, PROCSPEECH);
> spin_lock_irqsave(&speakup_info.spinlock,
> - flags);
> + flags);
> jiffy_delta_val = jiffy_delta->u.n.value;
> delay_time_val = delay_time->u.n.value;
> spin_unlock_irqrestore(&speakup_info.spinlock,
> - flags);
> + flags);
> schedule_timeout(msecs_to_jiffies
> (delay_time_val));
> jiff_max = jiffies + jiffy_delta_val;
> diff --git a/drivers/staging/speakup/speakup_keypc.c b/drivers/staging/speakup/speakup_keypc.c
> index de76183..3901734 100644
> --- a/drivers/staging/speakup/speakup_keypc.c
> +++ b/drivers/staging/speakup/speakup_keypc.c
> @@ -260,7 +260,7 @@ static int synth_probe(struct spk_synth *synth)
> if (port_forced) {
> synth_port = port_forced;
> pr_info("probe forced to %x by kernel command line\n",
> - synth_port);
> + synth_port);
> if (synth_request_region(synth_port-1, SYNTH_IO_EXTENT)) {
> pr_warn("sorry, port already reserved\n");
> return -EBUSY;
> @@ -269,7 +269,7 @@ static int synth_probe(struct spk_synth *synth)
> } else {
> for (i = 0; synth_portlist[i]; i++) {
> if (synth_request_region(synth_portlist[i],
> - SYNTH_IO_EXTENT)) {
> + SYNTH_IO_EXTENT)) {
> pr_warn
> ("request_region: failed with 0x%x, %d\n",
> synth_portlist[i], SYNTH_IO_EXTENT);
> diff --git a/drivers/staging/speakup/spk_ttyio.c b/drivers/staging/speakup/spk_ttyio.c
> index 5aa3ffa..3119402 100644
> --- a/drivers/staging/speakup/spk_ttyio.c
> +++ b/drivers/staging/speakup/spk_ttyio.c
> @@ -71,7 +71,7 @@ static void spk_ttyio_ldisc_close(struct tty_struct *tty)
> }
>
> static int spk_ttyio_receive_buf2(struct tty_struct *tty,
> - const unsigned char *cp, char *fp, int count)
> + const unsigned char *cp, char *fp, int count)
> {
> struct spk_ldisc_data *ldisc_data = tty->disc_data;
>
> --
> 2.7.4
>
--
Samuel
<O> Ça peut être une madeleine à sous munitions (avec des composants,
par exemple)
-+- #runtime -+-
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] staging: speakup: match alignment with open parenthesis
@ 2018-03-05 17:34 Santha Meena Ramamoorthy
2018-03-05 18:37 ` Samuel Thibault
0 siblings, 1 reply; 3+ messages in thread
From: Santha Meena Ramamoorthy @ 2018-03-05 17:34 UTC (permalink / raw)
To: gregkh
Cc: samuel.thibault, kirk, chris, w.d.hubbs, outreachy-kernel,
Santha Meena Ramamoorthy
Match alignment with the open parenthesis to conform to the Linux kernel
coding style. Issue found using checkpatch.
Signed-off-by: Santha Meena Ramamoorthy <santhameena13@gmail.com>
---
drivers/staging/speakup/main.c | 2 +-
drivers/staging/speakup/speakup_decpc.c | 6 +++---
drivers/staging/speakup/speakup_dectlk.c | 4 ++--
drivers/staging/speakup/speakup_keypc.c | 4 ++--
drivers/staging/speakup/spk_ttyio.c | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index d7cdec3..af30b70 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -417,7 +417,7 @@ static void announce_edge(struct vc_data *vc, int msg_id)
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));
+ spk_msg_get(MSG_EDGE_MSGS_START + msg_id - 1));
}
static void speak_char(u16 ch)
diff --git a/drivers/staging/speakup/speakup_decpc.c b/drivers/staging/speakup/speakup_decpc.c
index 303f393..6649309 100644
--- a/drivers/staging/speakup/speakup_decpc.c
+++ b/drivers/staging/speakup/speakup_decpc.c
@@ -349,7 +349,7 @@ static int testkernel(void)
return 0;
else if (dt_stat == 0x0dec)
pr_warn("dec_pc at 0x%x, software not loaded\n",
- speakup_info.port_tts);
+ speakup_info.port_tts);
status = -3;
oops: synth_release_region(speakup_info.port_tts, SYNTH_IO_EXTENT);
speakup_info.port_tts = 0;
@@ -412,11 +412,11 @@ static void do_catch_up(struct spk_synth *synth)
if (!in_escape)
dt_sendchar(PROCSPEECH);
spin_lock_irqsave(&speakup_info.spinlock,
- flags);
+ flags);
jiffy_delta_val = jiffy_delta->u.n.value;
delay_time_val = delay_time->u.n.value;
spin_unlock_irqrestore(&speakup_info.spinlock,
- flags);
+ flags);
schedule_timeout(msecs_to_jiffies
(delay_time_val));
jiff_max = jiffies + jiffy_delta_val;
diff --git a/drivers/staging/speakup/speakup_dectlk.c b/drivers/staging/speakup/speakup_dectlk.c
index 2ea22a2..a144f28 100644
--- a/drivers/staging/speakup/speakup_dectlk.c
+++ b/drivers/staging/speakup/speakup_dectlk.c
@@ -262,11 +262,11 @@ static void do_catch_up(struct spk_synth *synth)
if (!in_escape)
synth->io_ops->synth_out(synth, PROCSPEECH);
spin_lock_irqsave(&speakup_info.spinlock,
- flags);
+ flags);
jiffy_delta_val = jiffy_delta->u.n.value;
delay_time_val = delay_time->u.n.value;
spin_unlock_irqrestore(&speakup_info.spinlock,
- flags);
+ flags);
schedule_timeout(msecs_to_jiffies
(delay_time_val));
jiff_max = jiffies + jiffy_delta_val;
diff --git a/drivers/staging/speakup/speakup_keypc.c b/drivers/staging/speakup/speakup_keypc.c
index de76183..3901734 100644
--- a/drivers/staging/speakup/speakup_keypc.c
+++ b/drivers/staging/speakup/speakup_keypc.c
@@ -260,7 +260,7 @@ static int synth_probe(struct spk_synth *synth)
if (port_forced) {
synth_port = port_forced;
pr_info("probe forced to %x by kernel command line\n",
- synth_port);
+ synth_port);
if (synth_request_region(synth_port-1, SYNTH_IO_EXTENT)) {
pr_warn("sorry, port already reserved\n");
return -EBUSY;
@@ -269,7 +269,7 @@ static int synth_probe(struct spk_synth *synth)
} else {
for (i = 0; synth_portlist[i]; i++) {
if (synth_request_region(synth_portlist[i],
- SYNTH_IO_EXTENT)) {
+ SYNTH_IO_EXTENT)) {
pr_warn
("request_region: failed with 0x%x, %d\n",
synth_portlist[i], SYNTH_IO_EXTENT);
diff --git a/drivers/staging/speakup/spk_ttyio.c b/drivers/staging/speakup/spk_ttyio.c
index 5aa3ffa..3119402 100644
--- a/drivers/staging/speakup/spk_ttyio.c
+++ b/drivers/staging/speakup/spk_ttyio.c
@@ -71,7 +71,7 @@ static void spk_ttyio_ldisc_close(struct tty_struct *tty)
}
static int spk_ttyio_receive_buf2(struct tty_struct *tty,
- const unsigned char *cp, char *fp, int count)
+ const unsigned char *cp, char *fp, int count)
{
struct spk_ldisc_data *ldisc_data = tty->disc_data;
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-05 18:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-20 1:11 [PATCH] staging: speakup: Match alignment with open parenthesis Arushi Singhal
2018-03-05 17:34 [PATCH] staging: speakup: match " Santha Meena Ramamoorthy
2018-03-05 18:37 ` Samuel Thibault
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.