patch-2.4.20 linux-2.4.20/drivers/net/wan/comx-hw-munich.c
Next file: linux-2.4.20/drivers/net/wan/cosa.c
Previous file: linux-2.4.20/drivers/net/wan/comx-hw-comx.c
Back to the patch index
Back to the overall index
- Lines: 60
- Date:
Thu Nov 28 15:53:14 2002
- Orig file:
linux-2.4.19/drivers/net/wan/comx-hw-munich.c
- Orig date:
Fri Aug 2 17:39:44 2002
diff -urN linux-2.4.19/drivers/net/wan/comx-hw-munich.c linux-2.4.20/drivers/net/wan/comx-hw-munich.c
@@ -41,6 +41,7 @@
#include <asm/io.h>
#include <linux/ioport.h>
#include <linux/pci.h>
+#include <linux/init.h>
#define COMX_NEW
@@ -54,11 +55,9 @@
#include "falc-lh.h"
#endif
-MODULE_AUTHOR
- ("Bartok Istvan <bartoki@itc.hu>, Gergely Madarasz <gorgo@itc.hu>, Szilard Pasztor <don@itc.hu>");
-MODULE_DESCRIPTION
- ("Hardware-level driver for the SliceCOM and PciCOM (WelCOM) adapters");
-
+MODULE_AUTHOR("Bartok Istvan <bartoki@itc.hu>, Gergely Madarasz <gorgo@itc.hu>, Szilard Pasztor <don@itc.hu>");
+MODULE_DESCRIPTION("Hardware-level driver for the SliceCOM and PciCOM (WelCOM) adapters");
+MODULE_LICENSE("GPL");
/*
* TODO: az ilyenek a comxhw.h -ban szoktak lenni, idovel menjenek majd oda:
*/
@@ -1252,8 +1251,6 @@
/* jon interrupt, de nincs mit feldolgozni, akkor torlom a STAT-ot. */
/* 'needs a rewrite', de elso megoldasnak jo lesz */
// {
-
-udelay(10000);
int_info = board->tiq[board->tiq_ptr];
if (int_info.all & 0xF0000000) /* ha ez nem 0, akkor itt interrupt_info van */
{
@@ -1857,7 +1854,7 @@
if (board->isx21)
{
- board->modemline_timer.data = (unsigned int)board;
+ board->modemline_timer.data = (unsigned long)board;
board->modemline_timer.function = pcicom_modemline;
board->modemline_timer.expires = jiffies + HZ;
add_timer((struct timer_list *)&board->modemline_timer);
@@ -2008,7 +2005,8 @@
if (board->tiq) kfree((void *)board->tiq);
if (board->riq) kfree((void *)board->riq);
if (board->piq) kfree((void *)board->piq);
- board->ccb = board->tiq = board->riq = board->piq = NULL;
+ board->ccb = NULL;
+ board->tiq = board->riq = board->piq = NULL;
}
/* Enable setting of hw parameters */
@@ -2777,8 +2775,6 @@
static int BOARD_exit(struct net_device *dev)
{
struct comx_channel *ch = (struct comx_channel *)dev->priv;
- struct slicecom_privdata *hw = ch->HW_privdata;
-// munich_board_t *board;
/* Free private data area */
// board = hw->boardnum + (ch->hardware == &pcicomhw ? pcicom_boards : slicecom_boards);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)