1 files changed, 24 insertions, 14 deletions
diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
index d9eea013c753..8c05e47a4090 100644
--- a/include/sound/hwdep.h
+++ b/include/sound/hwdep.h
@@ -27,18 +27,28 @@
 struct snd_hwdep;
+/* hwdep file ops; all ops can be NULL */
 struct snd_hwdep_ops {
-        long long (*llseek) (struct snd_hwdep *hw, struct file * file, long long offset, int orig);
+        long long (*llseek)(struct snd_hwdep *hw, struct file *file,
-        long (*read) (struct snd_hwdep *hw, char __user *buf, long count, loff_t *offset);
+                            long long offset, int orig);
-        long (*write) (struct snd_hwdep *hw, const char __user *buf, long count, loff_t *offset);
+        long (*read)(struct snd_hwdep *hw, char __user *buf,
-        int (*open) (struct snd_hwdep * hw, struct file * file);
+                     long count, loff_t *offset);
-        int (*release) (struct snd_hwdep *hw, struct file * file);
+        long (*write)(struct snd_hwdep *hw, const char __user *buf,
-        unsigned int (*poll) (struct snd_hwdep *hw, struct file * file, poll_table * wait);
+                      long count, loff_t *offset);
-        int (*ioctl) (struct snd_hwdep *hw, struct file * file, unsigned int cmd, unsigned long arg);
+        int (*open)(struct snd_hwdep *hw, struct file * file);
-        int (*ioctl_compat) (struct snd_hwdep *hw, struct file * file, unsigned int cmd, unsigned long arg);
+        int (*release)(struct snd_hwdep *hw, struct file * file);
-        int (*mmap) (struct snd_hwdep *hw, struct file * file, struct vm_area_struct * vma);
+        unsigned int (*poll)(struct snd_hwdep *hw, struct file *file,
-        int (*dsp_status) (struct snd_hwdep *hw, struct snd_hwdep_dsp_status *status);
+                             poll_table *wait);
-        int (*dsp_load) (struct snd_hwdep *hw, struct snd_hwdep_dsp_image *image);
+        int (*ioctl)(struct snd_hwdep *hw, struct file *file,
+                     unsigned int cmd, unsigned long arg);
+        int (*ioctl_compat)(struct snd_hwdep *hw, struct file *file,
+                            unsigned int cmd, unsigned long arg);
+        int (*mmap)(struct snd_hwdep *hw, struct file *file,
+                    struct vm_area_struct *vma);
+        int (*dsp_status)(struct snd_hwdep *hw,
+                          struct snd_hwdep_dsp_status *status);
+        int (*dsp_load)(struct snd_hwdep *hw,
+                        struct snd_hwdep_dsp_image *image);
 };
 struct snd_hwdep {
@@ -61,9 +71,9 @@ struct snd_hwdep {
        void (*private_free) (struct snd_hwdep *hwdep);
        struct mutex open_mutex;
-        int used;
+        int used;                       /* reference counter */
-        unsigned int dsp_loaded;
+        unsigned int dsp_loaded;        /* bit fields of loaded dsp indices */
-        unsigned int exclusive: 1;
+        unsigned int exclusive:1;       /* exclusive access mode */
 };
 extern int snd_hwdep_new(struct snd_card *card, char *id, int device,

diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h index d9eea013c753..8c05e47a4090 100644 --- a/include/sound/hwdep.h +++ b/include/sound/hwdep.h
@@ -27,18 +27,28 @@
27		27
28	struct snd_hwdep;	28	struct snd_hwdep;
29		29
		30	/* hwdep file ops; all ops can be NULL */
30	struct snd_hwdep_ops {	31	struct snd_hwdep_ops {
31	long long (llseek) (struct snd_hwdep hw, struct file * file, long long offset, int orig);	32	long long (llseek)(struct snd_hwdep hw, struct file *file,
32	long (read) (struct snd_hwdep hw, char __user buf, long count, loff_t offset);	33	long long offset, int orig);
33	long (write) (struct snd_hwdep hw, const char __user buf, long count, loff_t offset);	34	long (read)(struct snd_hwdep hw, char __user *buf,
34	int (open) (struct snd_hwdep hw, struct file * file);	35	long count, loff_t *offset);
35	int (release) (struct snd_hwdep hw, struct file * file);	36	long (write)(struct snd_hwdep hw, const char __user *buf,
36	unsigned int (poll) (struct snd_hwdep hw, struct file * file, poll_table * wait);	37	long count, loff_t *offset);
37	int (ioctl) (struct snd_hwdep hw, struct file * file, unsigned int cmd, unsigned long arg);	38	int (open)(struct snd_hwdep hw, struct file * file);
38	int (ioctl_compat) (struct snd_hwdep hw, struct file * file, unsigned int cmd, unsigned long arg);	39	int (release)(struct snd_hwdep hw, struct file * file);
39	int (mmap) (struct snd_hwdep hw, struct file * file, struct vm_area_struct * vma);	40	unsigned int (poll)(struct snd_hwdep hw, struct file *file,
40	int (dsp_status) (struct snd_hwdep hw, struct snd_hwdep_dsp_status *status);	41	poll_table *wait);
41	int (dsp_load) (struct snd_hwdep hw, struct snd_hwdep_dsp_image *image);	42	int (ioctl)(struct snd_hwdep hw, struct file *file,
		43	unsigned int cmd, unsigned long arg);
		44	int (ioctl_compat)(struct snd_hwdep hw, struct file *file,
		45	unsigned int cmd, unsigned long arg);
		46	int (mmap)(struct snd_hwdep hw, struct file *file,
		47	struct vm_area_struct *vma);
		48	int (dsp_status)(struct snd_hwdep hw,
		49	struct snd_hwdep_dsp_status *status);
		50	int (dsp_load)(struct snd_hwdep hw,
		51	struct snd_hwdep_dsp_image *image);
42	};	52	};
43		53
44	struct snd_hwdep {	54	struct snd_hwdep {
@@ -61,9 +71,9 @@ struct snd_hwdep {
61	void (private_free) (struct snd_hwdep hwdep);	71	void (private_free) (struct snd_hwdep hwdep);
62		72
63	struct mutex open_mutex;	73	struct mutex open_mutex;
64	int used;	74	int used; /* reference counter */
65	unsigned int dsp_loaded;	75	unsigned int dsp_loaded; /* bit fields of loaded dsp indices */
66	unsigned int exclusive: 1;	76	unsigned int exclusive:1; /* exclusive access mode */
67	};	77	};
68		78
69	extern int snd_hwdep_new(struct snd_card card, char id, int device,	79	extern int snd_hwdep_new(struct snd_card card, char id, int device,