Skip to contentSkip to conversation

sparc: Use kmemdup rather than duplicating its implementation

PATCH Applied Thomas Meyer 2 participants 2 messages Nov 17, 2011 – Dec 4, 2011 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sparc: Use kmemdup rather than duplicating its implementation

The semantic patch that makes this change is available in scripts/coccinelle/api/memdup.cocci.

---

arch/sparc/kernel/ds.c 2011-11-08 11:00:49.874125928 +0100 renamed from arch/sparc/kernel/ds.c 2011-11-07 19:37:36.613113011 +0100 +2 -4
diff -u -p a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
@@ -1181,13 +1181,11 @@ static int __devinit ds_probe(struct vio
 
 	dp->rcv_buf_len = 4096;
 
-	dp->ds_states = kzalloc(sizeof(ds_states_template),
-				GFP_KERNEL);
+	dp->ds_states = kmemdup(ds_states_template,
+				sizeof(ds_states_template), GFP_KERNEL);
 	if (!dp->ds_states)
 		goto out_free_rcv_buf;
 
-	memcpy(dp->ds_states, ds_states_template,
-	       sizeof(ds_states_template));
 	dp->num_ds_states = ARRAY_SIZE(ds_states_template);
 
 	for (i = 0; i < dp->num_ds_states; i++)
arch/sparc/kernel/prom_common.c 2011-11-08 11:00:52.007487860 +0100 renamed from arch/sparc/kernel/prom_common.c 2011-11-07 19:39:05.191125118 +0100 +1 -3
diff -u -p a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
@@ -58,12 +58,10 @@ int of_set_property(struct device_node *
 	void *new_val;
 	int err;
 
-	new_val = kmalloc(len, GFP_KERNEL);
+	new_val = kmemdup(val, len, GFP_KERNEL);
 	if (!new_val)
 		return -ENOMEM;
 
-	memcpy(new_val, val, len);
-
 	err = -ENODEV;
 
 	mutex_lock(&of_set_property_mutex);