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

Commit f0a4cf31 authored by Thomas Meyer's avatar Thomas Meyer Committed by David S. Miller
Browse files

sparc: Use kmemdup rather than duplicating its implementation 



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

Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e5fd47bf

arch/sparc/kernel/ds.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1181,13 +1181,11 @@ static int __devinit ds_probe(struct vio_dev *vdev, 




	dp->rcv_buf_len = 4096;

	dp->rcv_buf_len = 4096;





	dp->ds_states = kzalloc(sizeof(ds_states_template),

	dp->ds_states = kmemdup(ds_states_template,

				GFP_KERNEL);

				sizeof(ds_states_template), GFP_KERNEL);

	if (!dp->ds_states)

	if (!dp->ds_states)

		goto out_free_rcv_buf;

		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);

	dp->num_ds_states = ARRAY_SIZE(ds_states_template);





	for (i = 0; i < dp->num_ds_states; i++)

	for (i = 0; i < dp->num_ds_states; i++)

arch/sparc/kernel/prom_common.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -58,12 +58,10 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len 
	void *new_val;

	void *new_val;

	int err;

	int err;





	new_val = kmalloc(len, GFP_KERNEL);

	new_val = kmemdup(val, len, GFP_KERNEL);

	if (!new_val)

	if (!new_val)

		return -ENOMEM;

		return -ENOMEM;





	memcpy(new_val, val, len);



	err = -ENODEV;

	err = -ENODEV;





	mutex_lock(&of_set_property_mutex);

	mutex_lock(&of_set_property_mutex);