2017-06-28 13:14:17

by Colin King

Subject: [PATCH] staging: speakup: make function ser_to_dev static

From: Colin Ian King <[email protected]>

The helper function ser_to_dev does not need to be in global scope, so
make it static.

Cleans up sparse warning:
"warning: symbol 'ser_to_dev' was not declared. Should it be static?"

Signed-off-by: Colin Ian King <[email protected]>
---
drivers/staging/speakup/spk_ttyio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/speakup/spk_ttyio.c b/drivers/staging/speakup/spk_ttyio.c
index 442f191a017e..ed8e96b06ead 100644
--- a/drivers/staging/speakup/spk_ttyio.c
+++ b/drivers/staging/speakup/spk_ttyio.c
@@ -21,7 +21,7 @@ struct spk_ldisc_data {
static struct spk_synth *spk_ttyio_synth;
static struct tty_struct *speakup_tty;

-int ser_to_dev(int ser, dev_t *dev_no)
+static int ser_to_dev(int ser, dev_t *dev_no)
{
if (ser < 0 || ser > (255 - 64)) {
pr_err("speakup: Invalid ser param. Must be between 0 and 191 inclusive.\n");
--
2.11.0

2017-06-28 14:49:20

by walter harms

Subject: Re: [PATCH] staging: speakup: make function ser_to_dev static

Am 28.06.2017 15:13, schrieb Colin King:
> From: Colin Ian King <[email protected]>
>
> The helper function ser_to_dev does not need to be in global scope, so
> make it static.
>
> Cleans up sparse warning:
> "warning: symbol 'ser_to_dev' was not declared. Should it be static?"
>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> drivers/staging/speakup/spk_ttyio.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/speakup/spk_ttyio.c b/drivers/staging/speakup/spk_ttyio.c
> index 442f191a017e..ed8e96b06ead 100644
> --- a/drivers/staging/speakup/spk_ttyio.c
> +++ b/drivers/staging/speakup/spk_ttyio.c
> @@ -21,7 +21,7 @@ struct spk_ldisc_data {
> static struct spk_synth *spk_ttyio_synth;
> static struct tty_struct *speakup_tty;
>
> -int ser_to_dev(int ser, dev_t *dev_no)
> +static int ser_to_dev(int ser, dev_t *dev_no)
> {
> if (ser < 0 || ser > (255 - 64)) {
> pr_err("speakup: Invalid ser param. Must be between 0 and 191 inclusive.\n");


Is there any remark, why the programmer decided to use (255 - 64) instead of 191 ?

re,
wh

2017-06-28 15:02:35

by Samuel Thibault

Subject: Re: [PATCH] staging: speakup: make function ser_to_dev static

walter harms, on mer. 28 juin 2017 16:49:03 +0200, wrote:
> Am 28.06.2017 15:13, schrieb Colin King:
> > diff --git a/drivers/staging/speakup/spk_ttyio.c b/drivers/staging/speakup/spk_ttyio.c
> > index 442f191a017e..ed8e96b06ead 100644
> > --- a/drivers/staging/speakup/spk_ttyio.c
> > +++ b/drivers/staging/speakup/spk_ttyio.c
> > @@ -21,7 +21,7 @@ struct spk_ldisc_data {
> > static struct spk_synth *spk_ttyio_synth;
> > static struct tty_struct *speakup_tty;
> >
> > -int ser_to_dev(int ser, dev_t *dev_no)
> > +static int ser_to_dev(int ser, dev_t *dev_no)
> > {
> > if (ser < 0 || ser > (255 - 64)) {
> > pr_err("speakup: Invalid ser param. Must be between 0 and 191 inclusive.\n");
>
>
> Is there any remark, why the programmer decided to use (255 - 64) instead of 191 ?

That's because minor numbers for ttyS* are starting from 64.

Samuel

2017-06-28 20:30:06

by Okash Khawaja

Subject: Re: [PATCH] staging: speakup: make function ser_to_dev static

Hi,

On Wed, Jun 28, 2017 at 02:13:51PM +0100, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> The helper function ser_to_dev does not need to be in global scope, so
> make it static.
>
> Cleans up sparse warning:
> "warning: symbol 'ser_to_dev' was not declared. Should it be static?"
Thanks very much!

>
> Signed-off-by: Colin Ian King <[email protected]>

Reviewed-by: Okash Khawaja <[email protected]>

> ---
> drivers/staging/speakup/spk_ttyio.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/speakup/spk_ttyio.c b/drivers/staging/speakup/spk_ttyio.c
> index 442f191a017e..ed8e96b06ead 100644
> --- a/drivers/staging/speakup/spk_ttyio.c
> +++ b/drivers/staging/speakup/spk_ttyio.c
> @@ -21,7 +21,7 @@ struct spk_ldisc_data {
> static struct spk_synth *spk_ttyio_synth;
> static struct tty_struct *speakup_tty;
>
> -int ser_to_dev(int ser, dev_t *dev_no)
> +static int ser_to_dev(int ser, dev_t *dev_no)
> {
> if (ser < 0 || ser > (255 - 64)) {
> pr_err("speakup: Invalid ser param. Must be between 0 and 191 inclusive.\n");
> --
> 2.11.0
>