Commit bae30a3f authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] synclink.c update

From: Paul Fulghum <paulkf@microgate.com>

* track driver API changes
* remove cast (kernel janitor)
parent 208516ea
/* /*
* linux/drivers/char/synclink.c * linux/drivers/char/synclink.c
* *
* $Id: synclink.c,v 4.16 2003/09/05 15:26:02 paulkf Exp $ * $Id: synclink.c,v 4.21 2004/03/08 15:29:22 paulkf Exp $
* *
* Device driver for Microgate SyncLink ISA and PCI * Device driver for Microgate SyncLink ISA and PCI
* high speed multiprotocol serial adapters. * high speed multiprotocol serial adapters.
...@@ -909,7 +909,7 @@ MODULE_PARM(txdmabufs,"1-" __MODULE_STRING(MAX_TOTAL_DEVICES) "i"); ...@@ -909,7 +909,7 @@ MODULE_PARM(txdmabufs,"1-" __MODULE_STRING(MAX_TOTAL_DEVICES) "i");
MODULE_PARM(txholdbufs,"1-" __MODULE_STRING(MAX_TOTAL_DEVICES) "i"); MODULE_PARM(txholdbufs,"1-" __MODULE_STRING(MAX_TOTAL_DEVICES) "i");
static char *driver_name = "SyncLink serial driver"; static char *driver_name = "SyncLink serial driver";
static char *driver_version = "$Revision: 4.16 $"; static char *driver_version = "$Revision: 4.21 $";
static int synclink_init_one (struct pci_dev *dev, static int synclink_init_one (struct pci_dev *dev,
const struct pci_device_id *ent); const struct pci_device_id *ent);
...@@ -7846,13 +7846,14 @@ static void mgsl_sppp_init(struct mgsl_struct *info) ...@@ -7846,13 +7846,14 @@ static void mgsl_sppp_init(struct mgsl_struct *info)
info->if_ptr = &info->pppdev; info->if_ptr = &info->pppdev;
info->netdev = info->pppdev.dev = d; info->netdev = info->pppdev.dev = d;
sppp_attach(&info->pppdev);
d->base_addr = info->io_base; d->base_addr = info->io_base;
d->irq = info->irq_level; d->irq = info->irq_level;
d->dma = info->dma_level; d->dma = info->dma_level;
d->priv = info; d->priv = info;
sppp_attach(&info->pppdev);
mgsl_setup(d);
if (register_netdev(d)) { if (register_netdev(d)) {
printk(KERN_WARNING "%s: register_netdev failed.\n", d->name); printk(KERN_WARNING "%s: register_netdev failed.\n", d->name);
sppp_detach(info->netdev); sppp_detach(info->netdev);
...@@ -8022,7 +8023,7 @@ struct net_device_stats *mgsl_net_stats(struct net_device *dev) ...@@ -8022,7 +8023,7 @@ struct net_device_stats *mgsl_net_stats(struct net_device *dev)
int mgsl_sppp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) int mgsl_sppp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{ {
struct mgsl_struct *info = (struct mgsl_struct *)dev->priv; struct mgsl_struct *info = dev->priv;
if (debug_level >= DEBUG_LEVEL_INFO) if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):mgsl_ioctl %s cmd=%08X\n", __FILE__,__LINE__, printk("%s(%d):mgsl_ioctl %s cmd=%08X\n", __FILE__,__LINE__,
info->netname, cmd ); info->netname, cmd );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment