Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PNP: replace strnicmp with strncasecmp

Browse source 
The kernel used to contain two functions for length-delimited,
case-insensitive string comparison, strnicmp with correct semantics and
a slightly buggy strncasecmp.  The latter is the POSIX name, so strnicmp
was renamed to strncasecmp, and strnicmp made into a wrapper for the new
strncasecmp to avoid breaking existing users.

To allow the compat wrapper strnicmp to be removed at some point in the
future, and to avoid the extra indirection cost, do
s/strnicmp/strncasecmp/g.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rasmus Villemoes 2014-10-13 15:54:54 -07:00 committed by Linus Torvalds
parent 40f5c777ec
commit 7fb1cab4ac
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/pnp/interface.c
View file

@ -346,41 +346,41 @@ static ssize_t resources_store(struct device *dmdev,
} }
buf = skip_spaces(buf); buf = skip_spaces(buf);
if (!strnicmp(buf, "disable", 7)) { if (!strncasecmp(buf, "disable", 7)) {
retval = pnp_disable_dev(dev); retval = pnp_disable_dev(dev);
goto done; goto done;
} }
if (!strnicmp(buf, "activate", 8)) { if (!strncasecmp(buf, "activate", 8)) {
retval = pnp_activate_dev(dev); retval = pnp_activate_dev(dev);
goto done; goto done;
} }
if (!strnicmp(buf, "fill", 4)) { if (!strncasecmp(buf, "fill", 4)) {
if (dev->active) if (dev->active)
goto done; goto done;
retval = pnp_auto_config_dev(dev); retval = pnp_auto_config_dev(dev);
goto done; goto done;
} }
if (!strnicmp(buf, "auto", 4)) { if (!strncasecmp(buf, "auto", 4)) {
if (dev->active) if (dev->active)
goto done; goto done;
pnp_init_resources(dev); pnp_init_resources(dev);
retval = pnp_auto_config_dev(dev); retval = pnp_auto_config_dev(dev);
goto done; goto done;
} }
if (!strnicmp(buf, "clear", 5)) { if (!strncasecmp(buf, "clear", 5)) {
if (dev->active) if (dev->active)
goto done; goto done;
pnp_init_resources(dev); pnp_init_resources(dev);
goto done; goto done;
} }
if (!strnicmp(buf, "get", 3)) { if (!strncasecmp(buf, "get", 3)) {
mutex_lock(&pnp_res_mutex); mutex_lock(&pnp_res_mutex);
if (pnp_can_read(dev)) if (pnp_can_read(dev))
dev->protocol->get(dev); dev->protocol->get(dev);
mutex_unlock(&pnp_res_mutex); mutex_unlock(&pnp_res_mutex);
goto done; goto done;
} }
if (!strnicmp(buf, "set", 3)) { if (!strncasecmp(buf, "set", 3)) {
resource_size_t start; resource_size_t start;
resource_size_t end; resource_size_t end;
unsigned long flags; unsigned long flags;
@ -392,31 +392,31 @@ static ssize_t resources_store(struct device *dmdev,
mutex_lock(&pnp_res_mutex); mutex_lock(&pnp_res_mutex);
while (1) { while (1) {
buf = skip_spaces(buf); buf = skip_spaces(buf);
if (!strnicmp(buf, "io", 2)) { if (!strncasecmp(buf, "io", 2)) {
buf = pnp_get_resource_value(buf + 2, buf = pnp_get_resource_value(buf + 2,
IORESOURCE_IO, IORESOURCE_IO,
&start, &end, &start, &end,
&flags); &flags);
pnp_add_io_resource(dev, start, end, flags); pnp_add_io_resource(dev, start, end, flags);
} else if (!strnicmp(buf, "mem", 3)) { } else if (!strncasecmp(buf, "mem", 3)) {
buf = pnp_get_resource_value(buf + 3, buf = pnp_get_resource_value(buf + 3,
IORESOURCE_MEM, IORESOURCE_MEM,
&start, &end, &start, &end,
&flags); &flags);
pnp_add_mem_resource(dev, start, end, flags); pnp_add_mem_resource(dev, start, end, flags);
} else if (!strnicmp(buf, "irq", 3)) { } else if (!strncasecmp(buf, "irq", 3)) {
buf = pnp_get_resource_value(buf + 3, buf = pnp_get_resource_value(buf + 3,
IORESOURCE_IRQ, IORESOURCE_IRQ,
&start, NULL, &start, NULL,
&flags); &flags);
pnp_add_irq_resource(dev, start, flags); pnp_add_irq_resource(dev, start, flags);
} else if (!strnicmp(buf, "dma", 3)) { } else if (!strncasecmp(buf, "dma", 3)) {
buf = pnp_get_resource_value(buf + 3, buf = pnp_get_resource_value(buf + 3,
IORESOURCE_DMA, IORESOURCE_DMA,
&start, NULL, &start, NULL,
&flags); &flags);
pnp_add_dma_resource(dev, start, flags); pnp_add_dma_resource(dev, start, flags);
} else if (!strnicmp(buf, "bus", 3)) { } else if (!strncasecmp(buf, "bus", 3)) {
buf = pnp_get_resource_value(buf + 3, buf = pnp_get_resource_value(buf + 3,
IORESOURCE_BUS, IORESOURCE_BUS,
&start, &end, &start, &end,