Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17a4506d authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[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: default avatarAlan Cox <alan@redhat.com>
Cc: Jeff Garzik <jeff@garzik.org>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 31e7e1a8

drivers/isdn/hisax/config.c

+3 −3
Original line number Diff line number Diff line
@@ -1721,11 +1721,11 @@ static void hisax_b_l1l2(struct hisax_if *ifc, int pr, void *arg) 
		hisax_b_sched_event(bcs, B_RCVBUFREADY);

		break;

	case PH_DATA | CONFIRM:

		bcs->tx_cnt -= (int) arg;

		bcs->tx_cnt -= (long)arg;

		if (test_bit(FLG_LLI_L1WAKEUP,&bcs->st->lli.flag)) {

			u_long	flags;

			spin_lock_irqsave(&bcs->aclock, flags);

			bcs->ackcnt += (int) arg;

			bcs->ackcnt += (long)arg;

			spin_unlock_irqrestore(&bcs->aclock, flags);

			schedule_event(bcs, B_ACKPENDING);

		}
@@ -1789,7 +1789,7 @@ static void hisax_b_l2l1(struct PStack *st, int pr, void *arg) 


	switch (pr) {

	case PH_ACTIVATE | REQUEST:

		B_L2L1(b_if, pr, (void *) st->l1.mode);

		B_L2L1(b_if, pr, (void *)(unsigned long)st->l1.mode);

		break;

	case PH_DATA | REQUEST:

	case PH_PULL | INDICATION:

drivers/isdn/hisax/hfc4s8s_l1.c

+4 −3
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ bch_l2l1(struct hisax_if *ifc, int pr, void *arg) 
	struct hfc4s8s_btype *bch = ifc->priv;

	struct hfc4s8s_l1 *l1 = bch->l1p;

	struct sk_buff *skb = (struct sk_buff *) arg;

	int mode = (int) arg;

	long mode = (long) arg;

	u_long flags;



	switch (pr) {
@@ -914,7 +914,7 @@ tx_d_frame(struct hfc4s8s_l1 *l1p) 
	struct sk_buff *skb;

	u_char f1, f2;

	u_char *cp;

	int cnt;

	long cnt;



	if (l1p->l1_state != 7)

		return;
@@ -980,7 +980,8 @@ tx_b_frame(struct hfc4s8s_btype *bch) 
	struct sk_buff *skb;

	struct hfc4s8s_l1 *l1 = bch->l1p;

	u_char *cp;

	int cnt, max, hdlc_num, ack_len = 0;

	int cnt, max, hdlc_num;

	long ack_len = 0;



	if (!l1->enabled || (bch->mode == L1_MODE_NULL))

		return;

drivers/isdn/hisax/hfc_sx.c

+2 −2
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ HFCSX_l1hw(struct PStack *st, int pr, void *arg) 
			break;

		case (HW_TESTLOOP | REQUEST):

			spin_lock_irqsave(&cs->lock, flags);

			switch ((int) arg) {

			switch ((long) arg) {

				case (1):

					Write_hfc(cs, HFCSX_B1_SSL, 0x80);	/* tx slot */

					Write_hfc(cs, HFCSX_B1_RSL, 0x80);	/* rx slot */
@@ -986,7 +986,7 @@ HFCSX_l1hw(struct PStack *st, int pr, void *arg) 
				default:

					spin_unlock_irqrestore(&cs->lock, flags);

					if (cs->debug & L1_DEB_WARN)

						debugl1(cs, "hfcsx_l1hw loop invalid %4x", (int) arg);

						debugl1(cs, "hfcsx_l1hw loop invalid %4lx", arg);

					return;

			}

			cs->hw.hfcsx.trm |= 0x80;	/* enable IOM-loop */

drivers/isdn/hisax/hfc_usb.c

+2 −2
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ tx_iso_complete(struct urb *urb, struct pt_regs *regs) 
				fifo->delete_flg = TRUE;

				fifo->hif->l1l2(fifo->hif,

						PH_DATA | CONFIRM,

						(void *) fifo->skbuff->

						(void *) (unsigned long) fifo->skbuff->

						truesize);

				if (fifo->skbuff && fifo->delete_flg) {

					dev_kfree_skb_any(fifo->skbuff);
@@ -1144,7 +1144,7 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg) 
				set_hfcmode(hfc,

					    (fifo->fifonum ==

					     HFCUSB_B1_TX) ? 0 : 1,

					    (int) arg);

					    (long) arg);

				fifo->hif->l1l2(fifo->hif,

						PH_ACTIVATE | INDICATION,

						NULL);

drivers/isdn/hisax/hisax_fcpcipnp.c

+7 −10
Original line number Diff line number Diff line
@@ -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,19 +998,16 @@ 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;

#endif

	return 0;



 out_unregister_pci:

	if (retval < 0) {

		pci_unregister_driver(&fcpci_driver);

 out:

		return retval;

	}

#endif

	return 0;

}



static void __exit hisax_fcpcipnp_exit(void)

{