Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66f969d0 authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

[PATCH] ipmi: strstrip conversion 



Switch an open-coded strstrip() to use the new API.

Acked-by: default avatarCorey Minyard <minyard@acm.org>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 481fad48

drivers/char/ipmi/ipmi_watchdog.c

+9 −16
Original line number Diff line number Diff line
@@ -212,24 +212,16 @@ static int set_param_str(const char *val, struct kernel_param *kp) 
{

	action_fn  fn = (action_fn) kp->arg;

	int        rv = 0;

	const char *end;

	char       valcp[16];

	int        len;



	/* Truncate leading and trailing spaces. */

	while (isspace(*val))

		val++;

	end = val + strlen(val) - 1;

	while ((end >= val) && isspace(*end))

		end--;

	len = end - val + 1;

	if (len > sizeof(valcp) - 1)

		return -EINVAL;

	memcpy(valcp, val, len);

	valcp[len] = '\0';

	char       *dup, *s;



	dup = kstrdup(val, GFP_KERNEL);

	if (!dup)

		return -ENOMEM;



	s = strstrip(dup);



	down_read(&register_sem);

	rv = fn(valcp, NULL);

	rv = fn(s, NULL);

	if (rv)

		goto out_unlock;
@@ -239,6 +231,7 @@ static int set_param_str(const char *val, struct kernel_param *kp) 


 out_unlock:

	up_read(&register_sem);

	kfree(dup);

	return rv;

}