isdn compile-errors (Linux 2.5.72)

2.5.70, justed patched to 2.5.71 (not compiled) and to 2.5.72:

# make
[...]
  CC [M]  drivers/isdn/capi/kcapi.o
drivers/isdn/capi/kcapi.c: In function `notify_push':
drivers/isdn/capi/kcapi.c:212: warning: `MOD_INC_USE_COUNT' is deprecated (decla
red at include/linux/module.h:478)
drivers/isdn/capi/kcapi.c:215: warning: `MOD_DEC_USE_COUNT' is deprecated (decla
red at include/linux/module.h:490)
drivers/isdn/capi/kcapi.c:229: warning: `MOD_INC_USE_COUNT' is deprecated (decla
red at include/linux/module.h:478)
drivers/isdn/capi/kcapi.c:231: warning: `MOD_DEC_USE_COUNT' is deprecated (decla
red at include/linux/module.h:490)
drivers/isdn/capi/kcapi.c: In function `notify_handler':
drivers/isdn/capi/kcapi.c:289: warning: `MOD_DEC_USE_COUNT' is deprecated (decla
red at include/linux/module.h:490)
drivers/isdn/capi/kcapi.c:291: warning: `MOD_DEC_USE_COUNT' is deprecated (decla
red at include/linux/module.h:490)
  CC [M]  drivers/isdn/capi/capiutil.o
  CC [M]  drivers/isdn/capi/capilib.o
  CC [M]  drivers/isdn/capi/kcapi_proc.o
  LD [M]  drivers/isdn/capi/kernelcapi.o
  CC [M]  drivers/isdn/hisax/config.o
  CC [M]  drivers/isdn/hisax/isdnl1.o
  CC [M]  drivers/isdn/hisax/tei.o
  CC [M]  drivers/isdn/hisax/isdnl2.o
  CC [M]  drivers/isdn/hisax/isdnl3.o
  CC [M]  drivers/isdn/hisax/lmgr.o
  CC [M]  drivers/isdn/hisax/q931.o
  CC [M]  drivers/isdn/hisax/callc.o
  CC [M]  drivers/isdn/hisax/fsm.o
  CC [M]  drivers/isdn/hisax/cert.o
  CC [M]  drivers/isdn/hisax/diva.o
drivers/isdn/hisax/diva.c:656: warning: `diva_ipacx_pci_probe' defined but not u
sed
  CC [M]  drivers/isdn/hisax/isac.o
  CC [M]  drivers/isdn/hisax/arcofi.o
  CC [M]  drivers/isdn/hisax/hscx.o
  CC [M]  drivers/isdn/hisax/ipac.o
  CC [M]  drivers/isdn/hisax/ipacx.o
  LD [M]  drivers/isdn/hisax/hisax.o
  CC [M]  drivers/isdn/i4l/isdn_net_lib.o
  CC [M]  drivers/isdn/i4l/isdn_fsm.o
  CC [M]  drivers/isdn/i4l/isdn_tty.o
drivers/isdn/i4l/isdn_tty.c: In function `isdn_tty_write':
drivers/isdn/i4l/isdn_tty.c:1198: warning: unused variable `m'
drivers/isdn/i4l/isdn_tty.c: In function `isdn_tty_open':
drivers/isdn/i4l/isdn_tty.c:1733: warning: `MOD_INC_USE_COUNT' is deprecated (de
clared at include/linux/module.h:478)
drivers/isdn/i4l/isdn_tty.c: In function `isdn_tty_close':
drivers/isdn/i4l/isdn_tty.c:1862: warning: `MOD_DEC_USE_COUNT' is deprecated (de
clared at include/linux/module.h:490)
drivers/isdn/i4l/isdn_tty.c: In function `modem_write_profile':
drivers/isdn/i4l/isdn_tty.c:1986: warning: implicit declaration of function `gro
up_send_sig_info'
drivers/isdn/i4l/isdn_tty.c: In function `isdn_tty_init':
drivers/isdn/i4l/isdn_tty.c:2099: invalid type argument of `->'
drivers/isdn/i4l/isdn_tty.c:2101: invalid type argument of `->'
drivers/isdn/i4l/isdn_tty.c:2102: invalid type argument of `->'
drivers/isdn/i4l/isdn_tty.c:2098: warning: label `err_unregister_tty' defined bu
t not used
drivers/isdn/i4l/isdn_tty.c: In function `isdn_tty_exit':
drivers/isdn/i4l/isdn_tty.c:2121: invalid type argument of `->'
drivers/isdn/i4l/isdn_tty.c:2122: invalid type argument of `->'
drivers/isdn/i4l/isdn_tty.c:2123: invalid type argument of `->'
drivers/isdn/i4l/isdn_tty.c: In function `isdn_tty_check_esc':
drivers/isdn/i4l/isdn_tty.c:2572: warning: comparison of distinct pointer types 
lacks a cast
drivers/isdn/i4l/isdn_tty.c:2575: warning: comparison of distinct pointer types 
lacks a cast
make[3]: *** [drivers/isdn/i4l/isdn_tty.o] Error 1
make[2]: *** [drivers/isdn/i4l] Error 2
make[1]: *** [drivers/isdn] Error 2
make: *** [drivers] Error 2

- M

*snip*

*snip*

Attached patch should fix these, though I've not tested it. (I hope I CC'd the right people.) Should apply against 2.5.72 vanilla.

-Josh

New PGP public key: 0x27AFC3EE

diff -ur linux-2.5.72.v/drivers/isdn/i4l/isdn_tty.c linux/drivers/isdn/i4l/isdn_tty.c
@@ -1195,7 +1195,6 @@
 	int c;
 	int total = 0;
 	modem_info *info = (modem_info *) tty->driver_data;
-	atemu *m = &info->emu;
 
 	if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_write"))
 		return 0;

@@ -2096,10 +2095,10 @@
 		kfree(info->xmit_buf - 4);
 	}
  err_unregister_tty:
-	tty_unregister_driver(&isdn_mdm->tty_modem);
+	tty_unregister_driver(&isdn_mdm.tty_modem);
  err:
-	put_tty_driver(&isdn_mdm->tty_modem);
-	isdn_mdm->tty_modem = NULL;
+	put_tty_driver(&isdn_mdm.tty_modem);
+	isdn_mdm.tty_modem = NULL;
 	return retval;
 }
 

@@ -2118,9 +2117,9 @@
 #endif
 		kfree(info->xmit_buf - 4);
 	}
-	tty_unregister_driver(&isdn_mdm->tty_modem);
-	put_tty_driver(&isdn_mdm->tty_modem);
-	isdn_mdm->tty_modem = NULL;
+	tty_unregister_driver(&isdn_mdm.tty_modem);
+	put_tty_driver(&isdn_mdm.tty_modem);
+	isdn_mdm.tty_modem = NULL;
 }
 
 /*

I already sent an update which fixes those errors and a couple of other bits to Linus. Thanks, though.

--Kai