Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / isdn / capi / capidrv.c

diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 6f5016b479f8a9188fd53a1624fe6cb5375db52e..cc9f1927a322ec9d8aa1a5a05cad351711d9f861 100644 (file)
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -469,8 +469,7 @@ static int capidrv_add_ack(struct capidrv_ncci *nccip,
 {
        struct ncci_datahandle_queue *n, **pp;
 
-       n = (struct ncci_datahandle_queue *)
-               kmalloc(sizeof(struct ncci_datahandle_queue), GFP_ATOMIC);
+       n = kmalloc(sizeof(struct ncci_datahandle_queue), GFP_ATOMIC);
        if (!n) {
                printk(KERN_ERR "capidrv: kmalloc ncci_datahandle failed\n");
                return -1;
@@ -1593,7 +1592,7 @@ static int capidrv_command(isdn_ctrl *c, capidrv_contr *card)
                return capidrv_ioctl(c, card);
 
        switch (c->command) {
-       case ISDN_CMD_DIAL:{
+       case ISDN_CMD_DIAL: {
                u8 calling[ISDN_MSNLEN + 3];
                u8 called[ISDN_MSNLEN + 2];
 
@@ -2072,7 +2071,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
        card->interface.writebuf_skb = if_sendbuf;
        card->interface.writecmd = NULL;
        card->interface.readstat = if_readstat;
-       card->interface.features = ISDN_FEATURE_L2_HDLC |
+       card->interface.features =
+               ISDN_FEATURE_L2_HDLC |
                ISDN_FEATURE_L2_TRANS |
                ISDN_FEATURE_L3_TRANS |
                ISDN_FEATURE_P_UNKNOWN |
@@ -2080,7 +2080,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
                ISDN_FEATURE_L2_X75UI |
                ISDN_FEATURE_L2_X75BUI;
        if (profp->support1 & (1 << 2))
-               card->interface.features |= ISDN_FEATURE_L2_V11096 |
+               card->interface.features |=
+                       ISDN_FEATURE_L2_V11096 |
                        ISDN_FEATURE_L2_V11019 |
                        ISDN_FEATURE_L2_V11038;
        if (profp->support1 & (1 << 8))