diff options
| author | Kees Cook <[email protected]> | 2017-10-16 17:29:15 -0700 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2017-10-18 12:39:39 +0100 |
| commit | c788dd2c64322f97e4fdc04ea3948c4209fbc8a7 (patch) | |
| tree | 90a8094784f0fdd53cad7a093bf9296a7b34cd51 | |
| parent | e313ac12eb13a9738116192848695da54c38b1ae (diff) | |
isdn/gigaset: Use kzalloc instead of open-coded field zeroing
This replaces a kmalloc followed by a bunch of per-field zeroing with a
single kzalloc call, reducing the lines of code.
Cc: Paul Bolle <[email protected]>
Cc: Karsten Keil <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Johan Hovold <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Kees Cook <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
| -rw-r--r-- | drivers/isdn/gigaset/bas-gigaset.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c index 2da3ff650e1d..33151f05e744 100644 --- a/drivers/isdn/gigaset/bas-gigaset.c +++ b/drivers/isdn/gigaset/bas-gigaset.c @@ -2200,7 +2200,7 @@ static int gigaset_initcshw(struct cardstate *cs) { struct bas_cardstate *ucs; - cs->hw.bas = ucs = kmalloc(sizeof *ucs, GFP_KERNEL); + cs->hw.bas = ucs = kzalloc(sizeof(*ucs), GFP_KERNEL); if (!ucs) { pr_err("out of memory\n"); return -ENOMEM; @@ -2212,15 +2212,7 @@ static int gigaset_initcshw(struct cardstate *cs) return -ENOMEM; } - ucs->urb_cmd_in = NULL; - ucs->urb_cmd_out = NULL; - ucs->rcvbuf = NULL; - ucs->rcvbuf_size = 0; - spin_lock_init(&ucs->lock); - ucs->pending = 0; - - ucs->basstate = 0; setup_timer(&ucs->timer_ctrl, req_timeout, (unsigned long) cs); setup_timer(&ucs->timer_atrdy, atrdy_timeout, (unsigned long) cs); setup_timer(&ucs->timer_cmd_in, cmd_in_timeout, (unsigned long) cs); |