Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1434914

[PATCH 5/6] staging: speakup: replace spk_strlwr() with strtolower()

From Markus Mayer <mmayer@broadcom.com>
Newsgroups linux.kernel
Subject [PATCH 5/6] staging: speakup: replace spk_strlwr() with strtolower()
Date 2016-07-01 02:00 +0200
Message-ID <rPU2e-7uX-15@gated-at.bofh.it> (permalink)
References <rPU2d-7uX-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

After introducing generic strtolower(), spk_strlwr() is no longer
needed.

Signed-off-by: Markus Mayer <mmayer@broadcom.com>
---
 drivers/staging/speakup/kobjects.c    |  2 +-
 drivers/staging/speakup/main.c        |  2 +-
 drivers/staging/speakup/speakup.h     |  1 -
 drivers/staging/speakup/varhandlers.c | 12 ------------
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
index 528cbdc..009c0d2 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -391,7 +391,7 @@ static ssize_t synth_store(struct kobject *kobj, struct kobj_attribute *attr,
 	if (new_synth_name[len - 1] == '\n')
 		len--;
 	new_synth_name[len] = '\0';
-	spk_strlwr(new_synth_name);
+	strtolower(new_synth_name);
 	if ((synth != NULL) && (!strcmp(new_synth_name, synth->name))) {
 		pr_warn("%s already in use\n", new_synth_name);
 	} else if (synth_init(new_synth_name) != 0) {
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 97ca4ec..3f3f254 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -2314,7 +2314,7 @@ static int __init speakup_init(void)
 	spk_initialize_msgs();	/* Initialize arrays for i18n. */
 	spk_reset_default_chars();
 	spk_reset_default_chartab();
-	spk_strlwr(synth_name);
+	strtolower(synth_name);
 	spk_vars[0].u.n.high = vc->vc_cols;
 	for (var = spk_vars; var->var_id != MAXVARS; var++)
 		speakup_register_var(var);
diff --git a/drivers/staging/speakup/speakup.h b/drivers/staging/speakup/speakup.h
index df74c91..4725785 100644
--- a/drivers/staging/speakup/speakup.h
+++ b/drivers/staging/speakup/speakup.h
@@ -50,7 +50,6 @@ void synth_insert_next_index(int sent_num);
 void spk_reset_index_count(int sc);
 void spk_get_index_count(int *linecount, int *sentcount);
 int spk_set_key_info(const u_char *key_info, u_char *k_buffer);
-char *spk_strlwr(char *s);
 char *spk_s2uchar(char *start, char *dest);
 int speakup_kobj_init(void);
 void speakup_kobj_exit(void);
diff --git a/drivers/staging/speakup/varhandlers.c b/drivers/staging/speakup/varhandlers.c
index e1393d2..a1af222 100644
--- a/drivers/staging/speakup/varhandlers.c
+++ b/drivers/staging/speakup/varhandlers.c
@@ -309,18 +309,6 @@ int spk_set_mask_bits(const char *input, const int which, const int how)
 	return 0;
 }
 
-char *spk_strlwr(char *s)
-{
-	char *p;
-
-	if (!s)
-		return NULL;
-
-	for (p = s; *p; p++)
-		*p = tolower(*p);
-	return s;
-}
-
 char *spk_s2uchar(char *start, char *dest)
 {
 	int val;
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] lib: string: add function strtolower() Markus Mayer <mmayer@broadcom.com> - 2016-07-01 02:00 +0200
  [PATCH 4/6] ACPI / device_sysfs: make use of new strtolower() function Markus Mayer <mmayer@broadcom.com> - 2016-07-01 02:00 +0200
    Re: [PATCH 4/6] ACPI / device_sysfs: make use of new strtolower() function "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-07-01 22:50 +0200
  [PATCH 2/6] drm/nouveau/core: make use of new strtolower() function Markus Mayer <mmayer@broadcom.com> - 2016-07-01 02:00 +0200
    Re: [Nouveau] [PATCH 2/6] drm/nouveau/core: make use of new  strtolower() function Alexandre Courbot <gnurou@gmail.com> - 2016-07-02 03:20 +0200
      Re: [Nouveau] [PATCH 2/6] drm/nouveau/core: make use of new  strtolower() function Markus Mayer <markus.mayer@broadcom.com> - 2016-07-02 17:30 +0200
        Re: [Nouveau] [PATCH 2/6] drm/nouveau/core: make use of new  strtolower() function Alexandre Courbot <gnurou@gmail.com> - 2016-07-04 03:40 +0200
          Re: [Nouveau] [PATCH 2/6] drm/nouveau/core: make use of new  strtolower() function Alexandre Courbot <gnurou@gmail.com> - 2016-07-04 05:50 +0200
  [PATCH 3/6] ACPICA: make use of new strtolower() function Markus Mayer <mmayer@broadcom.com> - 2016-07-01 02:00 +0200
    RE: [PATCH 3/6] ACPICA: make use of new strtolower() function "Moore, Robert" <robert.moore@intel.com> - 2016-07-01 03:20 +0200
      Re: [PATCH 3/6] ACPICA: make use of new strtolower() function Markus Mayer <markus.mayer@broadcom.com> - 2016-07-01 06:20 +0200
        RE: [PATCH 3/6] ACPICA: make use of new strtolower() function "Moore, Robert" <robert.moore@intel.com> - 2016-07-01 06:40 +0200
  [PATCH 5/6] staging: speakup: replace spk_strlwr() with strtolower() Markus Mayer <mmayer@broadcom.com> - 2016-07-01 02:00 +0200
    Re: [PATCH 5/6] staging: speakup: replace spk_strlwr() with  strtolower() Samuel Thibault <samuel.thibault@ens-lyon.org> - 2016-07-01 02:40 +0200
  [PATCH 1/6] lib: string: add function strtolower() Markus Mayer <mmayer@broadcom.com> - 2016-07-01 02:00 +0200
    Re: [PATCH 1/6] lib: string: add function strtolower() Jani Nikula <jani.nikula@linux.intel.com> - 2016-07-01 13:00 +0200
      Re: [PATCH 1/6] lib: string: add function strtolower() Markus Mayer <markus.mayer@broadcom.com> - 2016-07-01 19:20 +0200
        Re: [PATCH 1/6] lib: string: add function strtolower() Jani Nikula <jani.nikula@linux.intel.com> - 2016-07-01 19:40 +0200
    Re: [PATCH 1/6] lib: string: add function strtolower() Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2016-07-01 23:10 +0200
      Re: [PATCH 1/6] lib: string: add function strtolower() Markus Mayer <markus.mayer@broadcom.com> - 2016-07-04 22:20 +0200

csiph-web