patch-2.1.6 linux/drivers/sound/pas2_card.c

Next file: linux/drivers/sound/pas2_midi.c
Previous file: linux/drivers/sound/os.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.5/linux/drivers/sound/pas2_card.c linux/drivers/sound/pas2_card.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/config.h>
-
 #include "sound_config.h"
 
 #if defined(CONFIG_PAS)
@@ -30,7 +29,6 @@
 static int      pas_irq = 0;
 static int      pas_sb_base = 0;
 
-int            *pas_osp;
 
 char            pas_model;
 static char    *pas_model_names[] =
@@ -52,7 +50,7 @@
 void
 pas_write (unsigned char data, int ioaddr)
 {
-  outb (data, ioaddr ^ translate_code);
+  outb ((data), ioaddr ^ translate_code);
 }
 
 /******************* Begin of the Interrupt Handler ********************/
@@ -203,8 +201,8 @@
      * as per Media Vision.  Only define this if your PAS doesn't work correctly.
    */
 #ifdef SYMPHONY_PAS
-  outb (0x05, 0xa8);
-  outb (0x60, 0xa9);
+  outb ((0x05), 0xa8);
+  outb ((0x60), 0xa9);
 #endif
 
 #ifdef BROKEN_BUS_CLOCK
@@ -282,8 +280,8 @@
    * you have something on base port 0x388. SO be forewarned.
    */
 
-  outb (0xBC, 0x9A01);		/* Activate first board */
-  outb (hw_config->io_base >> 2, 0x9A01);	/* Set base address */
+  outb ((0xBC), 0x9A01);	/* Activate first board */
+  outb ((hw_config->io_base >> 2), 0x9A01);	/* Set base address */
   translate_code = 0x388 ^ hw_config->io_base;
   pas_write (1, 0xBF88);	/* Select one wait states */
 
@@ -318,7 +316,6 @@
 attach_pas_card (struct address_info *hw_config)
 {
   pas_irq = hw_config->irq;
-  pas_osp = hw_config->osp;
 
   if (detect_pas_hw (hw_config))
     {
@@ -359,7 +356,6 @@
 int
 probe_pas (struct address_info *hw_config)
 {
-  pas_osp = hw_config->osp;
   return detect_pas_hw (hw_config);
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov