patch-2.4.10 linux/drivers/net/irda/toshoboe.c

• Lines: 56
• Date: Sun Sep 23 09:55:14 2001
• Orig file: v2.4.9/linux/drivers/net/irda/toshoboe.c
• Orig date: Wed Jul 25 17:10:21 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/net/irda/toshoboe.c linux/drivers/net/irda/toshoboe.c
@@ -510,6 +510,7 @@
 toshoboe_net_open (struct net_device *dev)
 {
   struct toshoboe_cb *self;
+  char hwname[32];
 
   IRDA_DEBUG (4, __FUNCTION__ "()\n");
 
@@ -537,11 +538,13 @@
 
   /* Ready to play! */
   netif_start_queue(dev);  
+  /* Give self a hardware name */
+  sprintf(hwname, "Toshiba-FIR @ 0x%03x", self->base);
   /* 
    * Open new IrLAP layer instance, now that everything should be
    * initialized properly 
    */
-  self->irlap = irlap_open(dev, &self->qos);	
+  self->irlap = irlap_open(dev, &self->qos, hwname);	
 
   self->open = 1;
 	
@@ -695,7 +698,6 @@
 {
   struct toshoboe_cb *self;
   struct net_device *dev;
-  struct pm_dev *pmdev;
   int i = 0;
   int ok = 0;
   int err;
@@ -845,11 +847,6 @@
   }
   pci_set_drvdata(pci_dev,self);
 
-/*  pmdev = pm_register (PM_PCI_DEV, PM_PCI_ID(pci_dev), toshoboe_pmproc);
-  if (pmdev)
-	  pmdev->data = self;
-	  */
-
   printk (KERN_WARNING "ToshOboe: Using ");
 #ifdef ONETASK
   printk ("single");
@@ -948,9 +945,9 @@
 };
 
 int __init
-toshoboe_init (void) {
-  pci_module_init(&toshoboe_pci_driver);
-  return 0;
+toshoboe_init (void)
+{
+  return pci_module_init(&toshoboe_pci_driver);
 }
 
 void