Merge branch 'fix/hda' into topic/hda

12 files changed, 31 insertions, 40 deletions

diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c
index b63839e8f9bd..456a1b4d7832 100644
--- a/sound/oss/ac97_codec.c
+++ b/sound/oss/ac97_codec.c
@@ -30,7 +30,7 @@
  **************************************************************************
  *
  * History
- * May 02, 2003 Liam Girdwood <liam.girdwood@wolfsonmicro.com>
+ * May 02, 2003 Liam Girdwood <lrg@slimlogic.co.uk>
  *      Removed non existant WM9700
  *      Added support for WM9705, WM9708, WM9709, WM9710, WM9711
  *      WM9712 and WM9717
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index 23018a7c063a..81e1f443d094 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -93,7 +93,7 @@ static struct au1550_state {
         spinlock_t      lock;
         struct mutex open_mutex;
         struct mutex sem;
-        mode_t          open_mode;
+        fmode_t          open_mode;
         wait_queue_head_t open_wait;
 
         struct dmabuf {
diff --git a/sound/oss/dmasound/dmasound.h b/sound/oss/dmasound/dmasound.h
index d978b0096564..1308d8d34186 100644
--- a/sound/oss/dmasound/dmasound.h
+++ b/sound/oss/dmasound/dmasound.h
@@ -129,7 +129,7 @@ typedef struct {
     int (*mixer_ioctl)(u_int, u_long);  /* optional */
     int (*write_sq_setup)(void);        /* optional */
     int (*read_sq_setup)(void);         /* optional */
-    int (*sq_open)(mode_t);             /* optional */
+    int (*sq_open)(fmode_t);            /* optional */
     int (*state_info)(char *, size_t);  /* optional */
     void (*abort_read)(void);           /* optional */
     int min_dsp_speed;
@@ -235,7 +235,7 @@ struct sound_queue {
      */
     int active;
     wait_queue_head_t action_queue, open_queue, sync_queue;
-    int open_mode;
+    int non_blocking;
     int busy, syncing, xruns, died;
 };
 
diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c
index 285239d64b82..4d45bd63718b 100644
--- a/sound/oss/dmasound/dmasound_atari.c
+++ b/sound/oss/dmasound/dmasound_atari.c
@@ -143,7 +143,7 @@ static int AtaMixerIoctl(u_int cmd, u_long arg);
 static int TTMixerIoctl(u_int cmd, u_long arg);
 static int FalconMixerIoctl(u_int cmd, u_long arg);
 static int AtaWriteSqSetup(void);
-static int AtaSqOpen(mode_t mode);
+static int AtaSqOpen(fmode_t mode);
 static int TTStateInfo(char *buffer, size_t space);
 static int FalconStateInfo(char *buffer, size_t space);
 
@@ -1461,7 +1461,7 @@ static int AtaWriteSqSetup(void)
         return 0 ;
 }
 
-static int AtaSqOpen(mode_t mode)
+static int AtaSqOpen(fmode_t mode)
 {
         write_sq_ignore_int = 1;
         return 0 ;
diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c
index 95fc5c681755..793b7f478433 100644
--- a/sound/oss/dmasound/dmasound_core.c
+++ b/sound/oss/dmasound/dmasound_core.c
@@ -212,7 +212,7 @@ static int irq_installed;
 #endif /* MODULE */
 
 /* control over who can modify resources shared between play/record */
-static mode_t shared_resource_owner;
+static fmode_t shared_resource_owner;
 static int shared_resources_initialised;
 
     /*
@@ -603,7 +603,7 @@ static ssize_t sq_write(struct file *file, const char __user *src, size_t uLeft,
         while (uLeft) {
                 while (write_sq.count >= write_sq.max_active) {
                         sq_play();
-                        if (write_sq.open_mode & O_NONBLOCK)
+                        if (write_sq.non_blocking)
                                 return uWritten > 0 ? uWritten : -EAGAIN;
                         SLEEP(write_sq.action_queue);
                         if (signal_pending(current))
@@ -668,7 +668,7 @@ static inline void sq_init_waitqueue(struct sound_queue *sq)
 
 #if 0 /* blocking open() */
 static inline void sq_wake_up(struct sound_queue *sq, struct file *file,
-                              mode_t mode)
+                              fmode_t mode)
 {
         if (file->f_mode & mode) {
                 sq->busy = 0; /* CHECK: IS THIS OK??? */
@@ -677,7 +677,7 @@ static inline void sq_wake_up(struct sound_queue *sq, struct file *file,
 }
 #endif
 
-static int sq_open2(struct sound_queue *sq, struct file *file, mode_t mode,
+static int sq_open2(struct sound_queue *sq, struct file *file, fmode_t mode,
                     int numbufs, int bufsize)
 {
         int rc = 0;
@@ -718,7 +718,7 @@ static int sq_open2(struct sound_queue *sq, struct file *file, mode_t mode,
                         return rc;
                 }
 
-                sq->open_mode = file->f_mode;
+                sq->non_blocking = file->f_flags & O_NONBLOCK;
         }
         return rc;
 }
@@ -891,10 +891,10 @@ static int sq_release(struct inode *inode, struct file *file)
    is the owner - if we have problems.
 */
 
-static int shared_resources_are_mine(mode_t md)
+static int shared_resources_are_mine(fmode_t md)
 {
         if (shared_resource_owner)
-                return (shared_resource_owner & md ) ;
+                return (shared_resource_owner & md) != 0;
         else {
                 shared_resource_owner = md ;
                 return 1 ;
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index eb9bc365530d..c180598f1710 100644
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -1,7 +1,7 @@
 /*
  *      Initialisation code for Cyrix/NatSemi VSA1 softaudio
  *
- *      (C) Copyright 2003 Red Hat Inc <alan@redhat.com>
+ *      (C) Copyright 2003 Red Hat Inc <alan@lxorguk.ukuu.org.uk>
  *
  * XpressAudio(tm) is used on the Cyrix MediaGX (now NatSemi Geode) systems.
  * The older version (VSA1) provides fairly good soundblaster emulation
diff --git a/sound/oss/msnd.h b/sound/oss/msnd.h
index 61b3955481c5..c8be47ec2b7e 100644
--- a/sound/oss/msnd.h
+++ b/sound/oss/msnd.h
@@ -211,7 +211,7 @@ typedef struct multisound_dev {
 
         /* State variables */
         enum { msndClassic, msndPinnacle } type;
-        mode_t mode;
+        fmode_t mode;
         unsigned long flags;
 #define F_RESETTING                     0
 #define F_HAVEDIGITAL                   1
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c
index b493660deb36..e5d423994918 100644
--- a/sound/oss/sh_dac_audio.c
+++ b/sound/oss/sh_dac_audio.c
@@ -26,7 +26,7 @@
 #include <asm/cpu/dac.h>
 #include <asm/cpu/timer.h>
 #include <asm/machvec.h>
-#include <asm/hp6xx.h>
+#include <mach/hp6xx.h>
 #include <asm/hd64461.h>
 
 #define MODNAME "sh_dac_audio"
diff --git a/sound/oss/sound_config.h b/sound/oss/sound_config.h
index 1a00a3210616..55271fbe7f49 100644
--- a/sound/oss/sound_config.h
+++ b/sound/oss/sound_config.h
@@ -110,24 +110,16 @@ struct channel_info {
 #define OPEN_WRITE      PCM_ENABLE_OUTPUT
 #define OPEN_READWRITE  (OPEN_READ|OPEN_WRITE)
 
-#if OPEN_READ == FMODE_READ && OPEN_WRITE == FMODE_WRITE
-
-static inline int translate_mode(struct file *file)
-{
-        return file->f_mode;
-}
-
-#else
-
 static inline int translate_mode(struct file *file)
 {
-        return ((file->f_mode & FMODE_READ) ? OPEN_READ : 0) |
-                ((file->f_mode & FMODE_WRITE) ? OPEN_WRITE : 0);
+        if (OPEN_READ == (__force int)FMODE_READ &&
+            OPEN_WRITE == (__force int)FMODE_WRITE)
+                return (__force int)(file->f_mode & (FMODE_READ | FMODE_WRITE));
+        else
+                return ((file->f_mode & FMODE_READ) ? OPEN_READ : 0) |
+                        ((file->f_mode & FMODE_WRITE) ? OPEN_WRITE : 0);
 }
 
-#endif
-
-
 #include "sound_calls.h"
 #include "dev_table.h"
 
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index 7d89c081a086..61aaedae6b7e 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -560,19 +560,18 @@ static int __init oss_init(void)
         sound_dmap_flag = (dmabuf > 0 ? 1 : 0);
 
         for (i = 0; i < ARRAY_SIZE(dev_list); i++) {
-                device_create_drvdata(sound_class, NULL,
-                                      MKDEV(SOUND_MAJOR, dev_list[i].minor),
-                                      NULL, "%s", dev_list[i].name);
+                device_create(sound_class, NULL,
+                              MKDEV(SOUND_MAJOR, dev_list[i].minor), NULL,
+                              "%s", dev_list[i].name);
 
                 if (!dev_list[i].num)
                         continue;
 
                 for (j = 1; j < *dev_list[i].num; j++)
-                        device_create_drvdata(sound_class, NULL,
-                                              MKDEV(SOUND_MAJOR,
-                                                    dev_list[i].minor + (j*0x10)),
-                                              NULL,
-                                              "%s%d", dev_list[i].name, j);
+                        device_create(sound_class, NULL,
+                                      MKDEV(SOUND_MAJOR,
+                                            dev_list[i].minor + (j*0x10)),
+                                      NULL, "%s%d", dev_list[i].name, j);
         }
 
         if (sound_nblocks >= 1024)
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
index 044453a4ee5b..41562ecde5bb 100644
--- a/sound/oss/swarm_cs4297a.c
+++ b/sound/oss/swarm_cs4297a.c
@@ -295,7 +295,7 @@ struct cs4297a_state {
         struct mutex open_mutex;
         struct mutex open_sem_adc;
         struct mutex open_sem_dac;
-        mode_t open_mode;
+        fmode_t open_mode;
         wait_queue_head_t open_wait;
         wait_queue_head_t open_wait_adc;
         wait_queue_head_t open_wait_dac;
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c
index dcbb3f739e61..78b8acc7c3b9 100644
--- a/sound/oss/vwsnd.c
+++ b/sound/oss/vwsnd.c
@@ -1509,7 +1509,7 @@ typedef struct vwsnd_dev {
         struct mutex open_mutex;
         struct mutex io_mutex;
         struct mutex mix_mutex;
-        mode_t          open_mode;
+        fmode_t         open_mode;
         wait_queue_head_t open_wait;
 
         lithium_t       lith;