linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Markus Mayer <mmayer@broadcom.com>
To: William Hubbs <w.d.hubbs@gmail.com>,
	Chris Brannon <chris@the-brannons.com>,
	Kirk Reiser <kirk@reisers.ca>,
	Samuel Thibault <samuel.thibault@ens-lyon.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Markus Mayer <mmayer@broadcom.com>,
	speakup@linux-speakup.org, devel@driverdev.osuosl.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 5/6] staging: speakup: replace spk_strlwr() with strtolower()
Date: Thu, 30 Jun 2016 16:50:11 -0700	[thread overview]
Message-ID: <1467330612-26242-6-git-send-email-mmayer@broadcom.com> (raw)
In-Reply-To: <1467330612-26242-1-git-send-email-mmayer@broadcom.com>

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

  parent reply	other threads:[~2016-06-30 23:51 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-30 23:50 [PATCH 0/6] lib: string: add function strtolower() Markus Mayer
2016-06-30 23:50 ` [PATCH 1/6] " Markus Mayer
2016-07-01 10:52   ` Jani Nikula
2016-07-01 17:14     ` Markus Mayer
2016-07-01 17:33       ` Jani Nikula
2016-07-01 21:08   ` Rasmus Villemoes
2016-07-04 20:18     ` Markus Mayer
2016-06-30 23:50 ` [PATCH 2/6] drm/nouveau/core: make use of new strtolower() function Markus Mayer
2016-07-02  1:18   ` [Nouveau] " Alexandre Courbot
2016-07-02 15:21     ` Markus Mayer
2016-07-04  1:37       ` Alexandre Courbot
2016-07-04  3:39         ` Alexandre Courbot
2016-06-30 23:50 ` [PATCH 3/6] ACPICA: " Markus Mayer
2016-07-01  1:11   ` Moore, Robert
     [not found]     ` <CAGt4E5uqbjaubPWE4rq-T7MvqAmwpUhvakM+jv+Sen8est9U5g@mail.gmail.com>
     [not found]       ` <94F2FBAB4432B54E8AACC7DFDE6C92E37E4C381C@ORSMSX110.amr.corp.intel.com>
2016-07-01  4:13         ` Markus Mayer
2016-07-01  4:32           ` Moore, Robert
2016-06-30 23:50 ` [PATCH 4/6] ACPI / device_sysfs: " Markus Mayer
2016-07-01 20:44   ` Rafael J. Wysocki
2016-06-30 23:50 ` Markus Mayer [this message]
2016-06-30 23:53   ` [PATCH 5/6] staging: speakup: replace spk_strlwr() with strtolower() Samuel Thibault
2016-06-30 23:50 ` [PATCH 6/6] iscsi-target: replace iscsi_initiatorname_tolower() " Markus Mayer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1467330612-26242-6-git-send-email-mmayer@broadcom.com \
    --to=mmayer@broadcom.com \
    --cc=chris@the-brannons.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=kirk@reisers.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=samuel.thibault@ens-lyon.org \
    --cc=speakup@linux-speakup.org \
    --cc=w.d.hubbs@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).