diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-05-24 06:29:34 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-31 00:24:16 -0700 |
| commit | 9bfca3c6e5965a01b7c6d8e2f2ea30799c9d43bc (patch) | |
| tree | fff58796c91f08e987132b4e12c128c2b03fbe3a /net/caif | |
| parent | f5d72af9f3dfea67f014f880d00665f96622f57f (diff) | |
| download | linux-stable-9bfca3c6e5965a01b7c6d8e2f2ea30799c9d43bc.tar.gz linux-stable-9bfca3c6e5965a01b7c6d8e2f2ea30799c9d43bc.tar.bz2 linux-stable-9bfca3c6e5965a01b7c6d8e2f2ea30799c9d43bc.zip | |
caif: cleanup: remove duplicate checks
"phyinfo" can never be null here because we assigned it an address, so I
removed both the assert and the second check inside the if statement. I
removed the "phyinfo->phy_layer != NULL" check as well because that was
asserted earlier.
Walter Harms suggested I move the "phyinfo->phy_ref_count++;" outside
the if condition for readability, so I have done that.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Sjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif')
| -rw-r--r-- | net/caif/cfcnfg.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c index df43f264d9fb..7c81974a45c4 100644 --- a/net/caif/cfcnfg.c +++ b/net/caif/cfcnfg.c @@ -308,19 +308,15 @@ cfcnfg_linkup_rsp(struct cflayer *layer, u8 channel_id, enum cfctrl_srv serv, caif_assert(cnfg != NULL); caif_assert(phyid != 0); phyinfo = &cnfg->phy_layers[phyid]; - caif_assert(phyinfo != NULL); caif_assert(phyinfo->id == phyid); caif_assert(phyinfo->phy_layer != NULL); caif_assert(phyinfo->phy_layer->id == phyid); - if (phyinfo != NULL && - phyinfo->phy_ref_count++ == 0 && - phyinfo->phy_layer != NULL && + phyinfo->phy_ref_count++; + if (phyinfo->phy_ref_count == 1 && phyinfo->phy_layer->modemcmd != NULL) { - caif_assert(phyinfo->phy_layer->id == phyid); phyinfo->phy_layer->modemcmd(phyinfo->phy_layer, _CAIF_MODEMCMD_PHYIF_USEFULL); - } adapt_layer->id = channel_id; |