[PATCH] ISDN warning fixes

Clean up warnings in drivers/isdn by using long not int for the values
where we pass void * and cast to integer types.  The code is ok (ok passing
the stuff this way isn't pretty but the code is valid).  In all the cases I
checked out the right thing happens anyway but this removes all the
warnings.

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Jeff Garzik <jeff@garzik.org>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 1d7cf3bd6aa3..881a4165cfb4 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -546,7 +546,7 @@ static inline void hdlc_xpr_irq(struct fritz_bcs *bcs)
         }
         bcs->tx_cnt = 0;
         bcs->tx_skb = NULL;
-        B_L1L2(bcs, PH_DATA | CONFIRM, (void *) skb->truesize);
+        B_L1L2(bcs, PH_DATA | CONFIRM, (void *)(unsigned long)skb->truesize);
         dev_kfree_skb_irq(skb);
 }
 
@@ -635,7 +635,7 @@ static void fritz_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
                 hdlc_fill_fifo(bcs);
                 break;
         case PH_ACTIVATE | REQUEST:
-                mode = (int) arg;
+                mode = (long) arg;
                 DBG(4,"B%d,PH_ACTIVATE_REQUEST %d", bcs->channel + 1, mode);
                 modehdlc(bcs, mode);
                 B_L1L2(bcs, PH_ACTIVATE | INDICATION, NULL);
@@ -998,18 +998,15 @@ static int __init hisax_fcpcipnp_init(void)
 
         retval = pci_register_driver(&fcpci_driver);
         if (retval)
-                goto out;
+                return retval;
 #ifdef __ISAPNP__
         retval = pnp_register_driver(&fcpnp_driver);
-        if (retval < 0)
-                goto out_unregister_pci;
+        if (retval < 0) {
+                pci_unregister_driver(&fcpci_driver);
+                return retval;
+        }
 #endif
         return 0;
-
- out_unregister_pci:
-        pci_unregister_driver(&fcpci_driver);
- out:
-        return retval;
 }
 
 static void __exit hisax_fcpcipnp_exit(void)