diff options
| author | Thomas Meyer <thomas@m3y3r.de> | 2011-11-17 12:43:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-04 10:46:56 -0800 |
| commit | f0a4cf31017ac8179a2fe295c1bd8e821d7674f4 (patch) | |
| tree | 1a640c00647cc7eb90d9849033071270f39f81d7 /arch/sparc/kernel | |
| parent | e5fd47bfab2df0c2184cc0bf4245d8e1bb7724fb (diff) | |
| download | op-kernel-dev-f0a4cf31017ac8179a2fe295c1bd8e821d7674f4.zip op-kernel-dev-f0a4cf31017ac8179a2fe295c1bd8e821d7674f4.tar.gz | |
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: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/ds.c | 6 | ||||
| -rw-r--r-- | arch/sparc/kernel/prom_common.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c index 7429b47..381edcd 100644 --- a/arch/sparc/kernel/ds.c +++ b/arch/sparc/kernel/ds.c @@ -1181,13 +1181,11 @@ static int __devinit ds_probe(struct vio_dev *vdev, 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++) diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c index 4661480..741df91 100644 --- 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 *dp, const char *name, void *val, int len 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); |
