Changeset 124

Timestamp:

Jun 10, 2007, 6:36:39 AM (18 years ago)

Author:

Brendan Oakley

Message:

Fixed some more compile warnings.

Location:

GPL/trunk

Files:

• alsa-kernel/core/memalloc.c (modified) (2 diffs)
• alsa-kernel/core/misc.c (modified) (1 diff)
• alsa-kernel/core/pcm_native.c (modified) (1 diff)
• alsa-kernel/core/sgbuf.c (modified) (1 diff)
• include/linux/proc_fs.h (modified) (2 diffs)

GPL/trunk/alsa-kernel/core/memalloc.c

@@ -24 +24 @@
 #include <sound/driver.h>
 #include <sound/info.h>
+#include <linux/proc_fs.h>
 #include <sound/memalloc.h>
 
@@ -57 +58 @@
     struct list_head list;
 };
-
-#include <linux/proc_fs.h>
-static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
-        mode_t mode, struct proc_dir_entry *base,
-        read_proc_t *read_proc, void * data)
-{
-        struct proc_dir_entry *res=create_proc_entry(name,mode,base);
-        if (res) {
-                res->read_proc=read_proc;
-                res->data=data;
-        }
-        return res;
-}
 
 /* id for pre-allocated buffers */

GPL/trunk/alsa-kernel/core/misc.c

@@ -520 +520 @@
 #endif /* kernel version < 2.3.0 && CONFIG_APM */
 
-static void run_workqueue(struct workqueue_struct *wq)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&wq->lock, flags);
-        while (!list_empty(&wq->worklist)) {
-                struct work_struct *work = list_entry(wq->worklist.next,
-                                                      struct work_struct, entry);
-                void (*f) (void *) = work->func;
-                void *data = work->data;
-
-                list_del_init(wq->worklist.next);
-                spin_unlock_irqrestore(&wq->lock, flags);
-                clear_bit(0, &work->pending);
-                f(data);
-                spin_lock_irqsave(&wq->lock, flags);
-                wake_up(&wq->work_done);
-        }
-        spin_unlock_irqrestore(&wq->lock, flags);
-}
-
-#if 0
-void flush_workqueue(struct workqueue_struct *wq)
-{
-        if (0 /* wq->task == current */) {
-                run_workqueue(wq);
-        } else {
-                wait_queue_t wait;
-
-                init_waitqueue_entry(&wait, current);
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                spin_lock_irq(&wq->lock);
-                add_wait_queue(&wq->work_done, &wait);
-                while (!list_empty(&wq->worklist)) {
-                        spin_unlock_irq(&wq->lock);
-                        schedule();
-                        spin_lock_irq(&wq->lock);
-                }
-                remove_wait_queue(&wq->work_done, &wait);
-                spin_unlock_irq(&wq->lock);
-        }
-}
-#endif 
-
 void destroy_workqueue(struct workqueue_struct *wq)
 {

GPL/trunk/alsa-kernel/core/pcm_native.c

@@ -25 +25 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
+#include <sound/timer.h>
 #include <sound/minors.h>
 #include <linux/file.h>

GPL/trunk/alsa-kernel/core/sgbuf.c

@@ -27 +27 @@
 #define SGBUF_TBL_ALIGN         32
 #define sgbuf_align_table(tbl)  ((((tbl) + SGBUF_TBL_ALIGN - 1) / SGBUF_TBL_ALIGN) * SGBUF_TBL_ALIGN)
-
-/* set up the page table from the given vmalloc'ed buffer pointer.
- * return a negative error if the page is out of the pci address mask.
- */
-static int store_page_tables(struct snd_sg_buf *sgbuf, void *vmaddr, unsigned int pages)
-{
-        unsigned int i;
-
-        sgbuf->pages = 0;
-        DebugInt3();
-        for (i = 0; i < pages; i++) {
-                struct page *page;
-                void *ptr;
-                dma_addr_t addr;
-                ptr = (void*)virt_to_phys((void*)((char*)vmaddr + (i << PAGE_SHIFT)));
-//              ptr = get_vmalloc_addr(vmaddr + (i << PAGE_SHIFT));
-                addr = virt_to_bus(ptr);
-                page = virt_to_page((int)ptr);
-#ifdef DEBUG
-                dprintf(("virt mem: %x, phys: %x, addr: %x, page: %x",(char*)vmaddr, (char*)ptr, addr, page));
-#endif
-                sgbuf->table[i].buf = ptr;
-                sgbuf->table[i].addr = addr;
-                sgbuf->page_table[i] = page;
-                SetPageReserved(page);
-                sgbuf->pages++;
-        }
-        return 0;
-}
 
 /*

GPL/trunk/include/linux/proc_fs.h

@@ -191 +191 @@
 extern void proc_device_tree_init(void);
 
-struct proc_dir_entry *create_proc_read_entry(const char *name,
-        mode_t mode, struct proc_dir_entry *base, 
-        read_proc_t *read_proc, void * data);
+static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
+        mode_t mode, struct proc_dir_entry *base,
+        read_proc_t *read_proc, void * data)
+{
+        struct proc_dir_entry *res=create_proc_entry(name,mode,base);
+        if (res) {
+                res->read_proc=read_proc;
+                res->data=data;
+        }
+        return res;
+}
+
 struct proc_dir_entry *create_proc_info_entry(const char *name,
         mode_t mode, struct proc_dir_entry *base, get_info_t *get_info);
@@ -215 +224 @@
 extern inline void proc_tty_unregister_driver(struct tty_driver *driver) {};
 
-struct proc_dir_entry *create_proc_read_entry(const char *name,
+static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
         mode_t mode, struct proc_dir_entry *base, 
-        read_proc_t *read_proc, void * data);
+        read_proc_t *read_proc, void * data) { return NULL; }
 struct proc_dir_entry *create_proc_info_entry(const char *name,
         mode_t mode, struct proc_dir_entry *base, get_info_t *get_info);