3/7 use kstrdup library function in parport/probe.c
PATCH 1/1 3/7 use kstrdup library function in parport/probe.c
This patch removes a private strdup in parport/probe.c, and updates it to use the kstrdup library function.
Signed-off-by Paulo Marques <[email protected]>
--
Paulo Marques - www.grupopie.com
All that is necessary for the triumph of evil is that good men do nothing. Edmund Burke (1729 - 1797)
drivers/parport/probe.c renamed from drivers/parport/probe.c.orig +5 -13
@@ -48,14 +48,6 @@ static void pretty_print(struct parportprintk ("\n" ); } -static char *strdup (char *str) -{ -int n =strlen (str)+1 ; -char *s =kmalloc (n,GFP_KERNEL ); -if (!s)return NULL ; -return strcpy (s, str); -} -static void parse_data (struct parport *port,int device,char *str) {char *txt =kmalloc (strlen (str)+1 ,GFP_KERNEL );
@@ -88,16 +80,16 @@ static void parse_data(struct parport *pif (!strcmp (p,"MFG" ) || !strcmp (p,"MANUFACTURER" )) {if (info->mfr)kfree (info->mfr); - info->mfr =strdup (sep); + info->mfr =kstrdup (sep,GFP_KERNEL ); }else if (!strcmp (p,"MDL" ) || !strcmp (p,"MODEL" )) {if (info->model)kfree (info->model); - info->model =strdup (sep); + info->model =kstrdup (sep,GFP_KERNEL ); }else if (!strcmp (p,"CLS" ) || !strcmp (p,"CLASS" )) {int i;if (info->class_name)kfree (info->class_name); - info->class_name =strdup (sep); + info->class_name =kstrdup (sep,GFP_KERNEL );for (u = sep; *u; u++) *u =toupper (*u);for (i =0 ; classes[i].token; i++) {
@@ -112,7 +104,7 @@ static void parse_data(struct parport *p !strcmp(p, "COMMAND SET")) {if (info->cmdset)kfree (info->cmdset); - info->cmdset =strdup (sep); + info->cmdset =kstrdup (sep,GFP_KERNEL );/* if it speaks printer language, it's probably a printer */ if (strstr (sep,"PJL" ) ||strstr (sep,"PCL" ))
@@ -120,7 +112,7 @@ static void parse_data(struct parport *p }else if (!strcmp (p,"DES" ) || !strcmp (p,"DESCRIPTION" )) {if (info->description)kfree (info->description); - info->description =strdup (sep); + info->description =kstrdup (sep,GFP_KERNEL ); } } rock_on: