Re: [PATCH 6/9] ser_gigaset: checkpatch cleanup

From: Joe Perches
Date: Sun Oct 25 2009 - 20:55:03 EST


On Sun, 2009-10-25 at 20:30 +0100, Tilman Schmidt wrote:
> Duly uglified as demanded by checkpatch.pl.
> diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
> index 3071a52..ac3409e 100644
> --- a/drivers/isdn/gigaset/ser-gigaset.c
> +++ b/drivers/isdn/gigaset/ser-gigaset.c
> @@ -164,9 +164,15 @@ static void gigaset_modem_fill(unsigned long data)
> {
> struct cardstate *cs = (struct cardstate *) data;
> struct bc_state *bcs;
> + struct sk_buff *nextskb;
> int sent = 0;
>
> - if (!cs || !(bcs = cs->bcs)) {
> + if (!cs) {
> + gig_dbg(DEBUG_OUTPUT, "%s: no cardstate", __func__);
> + return;
> + }
> + bcs = cs->bcs;
> + if (!bcs) {
> gig_dbg(DEBUG_OUTPUT, "%s: no cardstate", __func__);
> return;
> }

perhaps:
if (!cs || !cs->bcs) {
gig_dbg(DEBUG_OUTPUT, "%s: no cardstate", __func__);
return;
}
bcs = cs->bcs;

[]

> @@ -404,16 +412,20 @@ static void gigaset_device_release(struct device *dev)
> static int gigaset_initcshw(struct cardstate *cs)
> {
> int rc;
> + struct ser_cardstate *scs;
>
> - if (!(cs->hw.ser = kzalloc(sizeof(struct ser_cardstate), GFP_KERNEL))) {
> + scs = kzalloc(sizeof(struct ser_cardstate), GFP_KERNEL);
> + if (!scs) {
> pr_err("out of memory\n");
> return 0;
> }
> + cs->hw.ser = scs;

Why not no temporary and just:

cs->hw.ser = kzalloc...
if (!cs->hw.ser)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/