Skip to content

L
linux-davinci-2.6.23
Commit 24c1f931 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files
Options

[ALSA] Remove xxx_t typedefs: Proc handler 

Modules: ALSA Core

Remove xxx_t typedefs from the core proc handler codes.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d9a98de2
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 103 deletions
include/sound/info.h
View file @ 24c1f931
......@@ -34,8 +34,6 @@ struct snd_info_buffer {
int error; /* error code */
};
typedef struct snd_info_buffer snd_info_buffer_t;
#define SNDRV_INFO_CONTENT_TEXT 0
#define SNDRV_INFO_CONTENT_DATA 1
......@@ -44,28 +42,28 @@ struct snd_info_entry;
struct snd_info_entry_text {
unsigned long read_size;
unsigned long write_size;
void (*read) (snd_info_entry_t *entry, snd_info_buffer_t * buffer);
void (*write) (snd_info_entry_t *entry, snd_info_buffer_t * buffer);
void (*read) (struct snd_info_entry *entry, struct snd_info_buffer *buffer);
void (*write) (struct snd_info_entry *entry, struct snd_info_buffer *buffer);
};
struct snd_info_entry_ops {
int (*open) (snd_info_entry_t *entry,
int (*open) (struct snd_info_entry *entry,
unsigned short mode, void **file_private_data);
int (*release) (snd_info_entry_t * entry,
int (*release) (struct snd_info_entry * entry,
unsigned short mode, void *file_private_data);
long (*read) (snd_info_entry_t *entry, void *file_private_data,
long (*read) (struct snd_info_entry *entry, void *file_private_data,
struct file * file, char __user *buf,
unsigned long count, unsigned long pos);
long (*write) (snd_info_entry_t *entry, void *file_private_data,
long (*write) (struct snd_info_entry *entry, void *file_private_data,
struct file * file, const char __user *buf,
unsigned long count, unsigned long pos);
long long (*llseek) (snd_info_entry_t *entry, void *file_private_data,
long long (*llseek) (struct snd_info_entry *entry, void *file_private_data,
struct file * file, long long offset, int orig);
unsigned int (*poll) (snd_info_entry_t *entry, void *file_private_data,
unsigned int (*poll) (struct snd_info_entry *entry, void *file_private_data,
struct file * file, poll_table * wait);
int (*ioctl) (snd_info_entry_t *entry, void *file_private_data,
int (*ioctl) (struct snd_info_entry *entry, void *file_private_data,
struct file * file, unsigned int cmd, unsigned long arg);
int (*mmap) (snd_info_entry_t *entry, void *file_private_data,
int (*mmap) (struct snd_info_entry *entry, void *file_private_data,
struct inode * inode, struct file * file,
struct vm_area_struct * vma);
};
......@@ -80,20 +78,20 @@ struct snd_info_entry {
struct snd_info_entry_text text;
struct snd_info_entry_ops *ops;
} c;
snd_info_entry_t *parent;
snd_card_t *card;
struct snd_info_entry *parent;
struct snd_card *card;
struct module *module;
void *private_data;
void (*private_free)(snd_info_entry_t *entry);
void (*private_free)(struct snd_info_entry *entry);
struct proc_dir_entry *p;
struct semaphore access;
};
extern int snd_info_check_reserved_words(const char *str);
int snd_info_check_reserved_words(const char *str);
#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
extern int snd_info_minor_register(void);
extern int snd_info_minor_unregister(void);
int snd_info_minor_register(void);
int snd_info_minor_unregister(void);
#else
#define snd_info_minor_register() /* NOP */
#define snd_info_minor_unregister() /* NOP */
......@@ -102,42 +100,42 @@ extern int snd_info_minor_unregister(void);
#ifdef CONFIG_PROC_FS
extern snd_info_entry_t *snd_seq_root;
extern struct snd_info_entry *snd_seq_root;
#ifdef CONFIG_SND_OSSEMUL
extern snd_info_entry_t *snd_oss_root;
extern struct snd_info_entry *snd_oss_root;
#else
#define snd_oss_root NULL
#endif
int snd_iprintf(snd_info_buffer_t * buffer, char *fmt,...) __attribute__ ((format (printf, 2, 3)));
int snd_iprintf(struct snd_info_buffer * buffer, char *fmt,...) __attribute__ ((format (printf, 2, 3)));
int snd_info_init(void);
int snd_info_done(void);
int snd_info_get_line(snd_info_buffer_t * buffer, char *line, int len);
int snd_info_get_line(struct snd_info_buffer * buffer, char *line, int len);
char *snd_info_get_str(char *dest, char *src, int len);
snd_info_entry_t *snd_info_create_module_entry(struct module * module,
struct snd_info_entry *snd_info_create_module_entry(struct module * module,
const char *name,
snd_info_entry_t * parent);
snd_info_entry_t *snd_info_create_card_entry(snd_card_t * card,
struct snd_info_entry * parent);
struct snd_info_entry *snd_info_create_card_entry(struct snd_card * card,
const char *name,
snd_info_entry_t * parent);
void snd_info_free_entry(snd_info_entry_t * entry);
int snd_info_store_text(snd_info_entry_t * entry);
int snd_info_restore_text(snd_info_entry_t * entry);
struct snd_info_entry * parent);
void snd_info_free_entry(struct snd_info_entry * entry);
int snd_info_store_text(struct snd_info_entry * entry);
int snd_info_restore_text(struct snd_info_entry * entry);
int snd_info_card_create(snd_card_t * card);
int snd_info_card_register(snd_card_t * card);
int snd_info_card_free(snd_card_t * card);
int snd_info_register(snd_info_entry_t * entry);
int snd_info_unregister(snd_info_entry_t * entry);
int snd_info_card_create(struct snd_card * card);
int snd_info_card_register(struct snd_card * card);
int snd_info_card_free(struct snd_card * card);
int snd_info_register(struct snd_info_entry * entry);
int snd_info_unregister(struct snd_info_entry * entry);
/* for card drivers */
int snd_card_proc_new(snd_card_t *card, const char *name, snd_info_entry_t **entryp);
int snd_card_proc_new(struct snd_card *card, const char *name, struct snd_info_entry **entryp);
static inline void snd_info_set_text_ops(snd_info_entry_t *entry,
static inline void snd_info_set_text_ops(struct snd_info_entry *entry,
void *private_data,
long read_size,
void (*read)(snd_info_entry_t *, snd_info_buffer_t *))
void (*read)(struct snd_info_entry *, struct snd_info_buffer *))
{
entry->private_data = private_data;
entry->c.text.read_size = read_size;
......@@ -150,21 +148,21 @@ static inline void snd_info_set_text_ops(snd_info_entry_t *entry,
#define snd_seq_root NULL
#define snd_oss_root NULL
static inline int snd_iprintf(snd_info_buffer_t * buffer, char *fmt,...) { return 0; }
static inline int snd_iprintf(struct snd_info_buffer * buffer, char *fmt,...) { return 0; }
static inline int snd_info_init(void) { return 0; }
static inline int snd_info_done(void) { return 0; }
static inline int snd_info_get_line(snd_info_buffer_t * buffer, char *line, int len) { return 0; }
static inline int snd_info_get_line(struct snd_info_buffer * buffer, char *line, int len) { return 0; }
static inline char *snd_info_get_str(char *dest, char *src, int len) { return NULL; }
static inline snd_info_entry_t *snd_info_create_module_entry(struct module * module, const char *name, snd_info_entry_t * parent) { return NULL; }
static inline snd_info_entry_t *snd_info_create_card_entry(snd_card_t * card, const char *name, snd_info_entry_t * parent) { return NULL; }
static inline void snd_info_free_entry(snd_info_entry_t * entry) { ; }
static inline struct snd_info_entry *snd_info_create_module_entry(struct module * module, const char *name, struct snd_info_entry * parent) { return NULL; }
static inline struct snd_info_entry *snd_info_create_card_entry(struct snd_card * card, const char *name, struct snd_info_entry * parent) { return NULL; }
static inline void snd_info_free_entry(struct snd_info_entry * entry) { ; }
static inline int snd_info_card_create(snd_card_t * card) { return 0; }
static inline int snd_info_card_register(snd_card_t * card) { return 0; }
static inline int snd_info_card_free(snd_card_t * card) { return 0; }
static inline int snd_info_register(snd_info_entry_t * entry) { return 0; }
static inline int snd_info_unregister(snd_info_entry_t * entry) { return 0; }
static inline int snd_info_card_create(struct snd_card * card) { return 0; }
static inline int snd_info_card_register(struct snd_card * card) { return 0; }
static inline int snd_info_card_free(struct snd_card * card) { return 0; }
static inline int snd_info_register(struct snd_info_entry * entry) { return 0; }
static inline int snd_info_unregister(struct snd_info_entry * entry) { return 0; }
#define snd_card_proc_new(card,name,entryp) 0 /* always success */
#define snd_info_set_text_ops(entry,private_data,read_size,read) /*NOP*/
......@@ -185,7 +183,7 @@ static inline int snd_info_unregister(snd_info_entry_t * entry) { return 0; }
#define SNDRV_OSS_INFO_DEV_COUNT 6
extern int snd_oss_info_register(int dev, int num, char *string);
int snd_oss_info_register(int dev, int num, char *string);
#define snd_oss_info_unregister(dev, num) snd_oss_info_register(dev, num, NULL)
#endif /* CONFIG_SND_OSSEMUL && CONFIG_PROC_FS */
......
sound/core/info.c
View file @ 24c1f931
......@@ -70,12 +70,12 @@ int snd_info_check_reserved_words(const char *str)
static DECLARE_MUTEX(info_mutex);
typedef struct _snd_info_private_data {
snd_info_buffer_t *rbuffer;
snd_info_buffer_t *wbuffer;
snd_info_entry_t *entry;
struct snd_info_private_data {
struct snd_info_buffer *rbuffer;
struct snd_info_buffer *wbuffer;
struct snd_info_entry *entry;
void *file_private_data;
} snd_info_private_data_t;
};
static int snd_info_version_init(void);
static int snd_info_version_done(void);
......@@ -90,7 +90,7 @@ static int snd_info_version_done(void);
*
* Returns the size of output string.
*/
int snd_iprintf(snd_info_buffer_t * buffer, char *fmt,...)
int snd_iprintf(struct snd_info_buffer *buffer, char *fmt,...)
{
va_list args;
int len, res;
......@@ -115,9 +115,9 @@ int snd_iprintf(snd_info_buffer_t * buffer, char *fmt,...)
*/
static struct proc_dir_entry *snd_proc_root = NULL;
snd_info_entry_t *snd_seq_root = NULL;
struct snd_info_entry *snd_seq_root = NULL;
#ifdef CONFIG_SND_OSSEMUL
snd_info_entry_t *snd_oss_root = NULL;
struct snd_info_entry *snd_oss_root = NULL;
#endif
static inline void snd_info_entry_prepare(struct proc_dir_entry *de)
......@@ -134,7 +134,7 @@ static void snd_remove_proc_entry(struct proc_dir_entry *parent,
static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)
{
snd_info_private_data_t *data;
struct snd_info_private_data *data;
struct snd_info_entry *entry;
loff_t ret;
......@@ -176,9 +176,9 @@ out:
static ssize_t snd_info_entry_read(struct file *file, char __user *buffer,
size_t count, loff_t * offset)
{
snd_info_private_data_t *data;
struct snd_info_private_data *data;
struct snd_info_entry *entry;
snd_info_buffer_t *buf;
struct snd_info_buffer *buf;
size_t size = 0;
loff_t pos;
......@@ -217,9 +217,9 @@ static ssize_t snd_info_entry_read(struct file *file, char __user *buffer,
static ssize_t snd_info_entry_write(struct file *file, const char __user *buffer,
size_t count, loff_t * offset)
{
snd_info_private_data_t *data;
struct snd_info_private_data *data;
struct snd_info_entry *entry;
snd_info_buffer_t *buf;
struct snd_info_buffer *buf;
size_t size = 0;
loff_t pos;
......@@ -259,15 +259,15 @@ static ssize_t snd_info_entry_write(struct file *file, const char __user *buffer
static int snd_info_entry_open(struct inode *inode, struct file *file)
{
snd_info_entry_t *entry;
snd_info_private_data_t *data;
snd_info_buffer_t *buffer;
struct snd_info_entry *entry;
struct snd_info_private_data *data;
struct snd_info_buffer *buffer;
struct proc_dir_entry *p;
int mode, err;
down(&info_mutex);
p = PDE(inode);
entry = p == NULL ? NULL : (snd_info_entry_t *)p->data;
entry = p == NULL ? NULL : (struct snd_info_entry *)p->data;
if (entry == NULL || entry->disconnected) {
up(&info_mutex);
return -ENODEV;
......@@ -381,8 +381,8 @@ static int snd_info_entry_open(struct inode *inode, struct file *file)
static int snd_info_entry_release(struct inode *inode, struct file *file)
{
snd_info_entry_t *entry;
snd_info_private_data_t *data;
struct snd_info_entry *entry;
struct snd_info_private_data *data;
int mode;
mode = file->f_flags & O_ACCMODE;
......@@ -420,7 +420,7 @@ static int snd_info_entry_release(struct inode *inode, struct file *file)
static unsigned int snd_info_entry_poll(struct file *file, poll_table * wait)
{
snd_info_private_data_t *data;
struct snd_info_private_data *data;
struct snd_info_entry *entry;
unsigned int mask;
......@@ -447,7 +447,7 @@ static unsigned int snd_info_entry_poll(struct file *file, poll_table * wait)
static inline int _snd_info_entry_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
snd_info_private_data_t *data;
struct snd_info_private_data *data;
struct snd_info_entry *entry;
data = file->private_data;
......@@ -479,7 +479,7 @@ static int snd_info_entry_ioctl(struct inode *inode, struct file *file,
static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)
{
struct inode *inode = file->f_dentry->d_inode;
snd_info_private_data_t *data;
struct snd_info_private_data *data;
struct snd_info_entry *entry;
data = file->private_data;
......@@ -541,7 +541,7 @@ int __init snd_info_init(void)
snd_proc_root = p;
#ifdef CONFIG_SND_OSSEMUL
{
snd_info_entry_t *entry;
struct snd_info_entry *entry;
if ((entry = snd_info_create_module_entry(THIS_MODULE, "oss", NULL)) == NULL)
return -ENOMEM;
entry->mode = S_IFDIR | S_IRUGO | S_IXUGO;
......@@ -554,7 +554,7 @@ int __init snd_info_init(void)
#endif
#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
{
snd_info_entry_t *entry;
struct snd_info_entry *entry;
if ((entry = snd_info_create_module_entry(THIS_MODULE, "seq", NULL)) == NULL)
return -ENOMEM;
entry->mode = S_IFDIR | S_IRUGO | S_IXUGO;
......@@ -601,10 +601,10 @@ int __exit snd_info_done(void)
* create a card proc file
* called from init.c
*/
int snd_info_card_create(snd_card_t * card)
int snd_info_card_create(struct snd_card *card)
{
char str[8];
snd_info_entry_t *entry;
struct snd_info_entry *entry;
snd_assert(card != NULL, return -ENXIO);
......@@ -624,7 +624,7 @@ int snd_info_card_create(snd_card_t * card)
* register the card proc file
* called from init.c
*/
int snd_info_card_register(snd_card_t * card)
int snd_info_card_register(struct snd_card *card)
{
struct proc_dir_entry *p;
......@@ -644,7 +644,7 @@ int snd_info_card_register(snd_card_t * card)
* de-register the card proc file
* called from init.c
*/
int snd_info_card_free(snd_card_t * card)
int snd_info_card_free(struct snd_card *card)
{
snd_assert(card != NULL, return -ENXIO);
if (card->proc_root_link) {
......@@ -669,7 +669,7 @@ int snd_info_card_free(snd_card_t * card)
*
* Returns zero if successful, or 1 if error or EOF.
*/
int snd_info_get_line(snd_info_buffer_t * buffer, char *line, int len)
int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len)
{
int c = -1;
......@@ -747,9 +747,9 @@ char *snd_info_get_str(char *dest, char *src, int len)
*
* Returns the pointer of the new instance, or NULL on failure.
*/
static snd_info_entry_t *snd_info_create_entry(const char *name)
static struct snd_info_entry *snd_info_create_entry(const char *name)
{
snd_info_entry_t *entry;
struct snd_info_entry *entry;
entry = kzalloc(sizeof(*entry), GFP_KERNEL);
if (entry == NULL)
return NULL;
......@@ -774,11 +774,11 @@ static snd_info_entry_t *snd_info_create_entry(const char *name)
*
* Returns the pointer of the new instance, or NULL on failure.
*/
snd_info_entry_t *snd_info_create_module_entry(struct module * module,
struct snd_info_entry *snd_info_create_module_entry(struct module * module,
const char *name,
snd_info_entry_t *parent)
struct snd_info_entry *parent)
{
snd_info_entry_t *entry = snd_info_create_entry(name);
struct snd_info_entry *entry = snd_info_create_entry(name);
if (entry) {
entry->module = module;
entry->parent = parent;
......@@ -796,11 +796,11 @@ snd_info_entry_t *snd_info_create_module_entry(struct module * module,
*
* Returns the pointer of the new instance, or NULL on failure.
*/
snd_info_entry_t *snd_info_create_card_entry(snd_card_t * card,
struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card,
const char *name,
snd_info_entry_t * parent)
struct snd_info_entry * parent)
{
snd_info_entry_t *entry = snd_info_create_entry(name);
struct snd_info_entry *entry = snd_info_create_entry(name);
if (entry) {
entry->module = card->module;
entry->card = card;
......@@ -809,29 +809,29 @@ snd_info_entry_t *snd_info_create_card_entry(snd_card_t * card,
return entry;
}
static int snd_info_dev_free_entry(snd_device_t *device)
static int snd_info_dev_free_entry(struct snd_device *device)
{
snd_info_entry_t *entry = device->device_data;
struct snd_info_entry *entry = device->device_data;
snd_info_free_entry(entry);
return 0;
}
static int snd_info_dev_register_entry(snd_device_t *device)
static int snd_info_dev_register_entry(struct snd_device *device)
{
snd_info_entry_t *entry = device->device_data;
struct snd_info_entry *entry = device->device_data;
return snd_info_register(entry);
}
static int snd_info_dev_disconnect_entry(snd_device_t *device)
static int snd_info_dev_disconnect_entry(struct snd_device *device)
{
snd_info_entry_t *entry = device->device_data;
struct snd_info_entry *entry = device->device_data;
entry->disconnected = 1;
return 0;
}
static int snd_info_dev_unregister_entry(snd_device_t *device)
static int snd_info_dev_unregister_entry(struct snd_device *device)
{
snd_info_entry_t *entry = device->device_data;
struct snd_info_entry *entry = device->device_data;
return snd_info_unregister(entry);
}
......@@ -855,16 +855,16 @@ static int snd_info_dev_unregister_entry(snd_device_t *device)
*
* Returns zero if successful, or a negative error code on failure.
*/
int snd_card_proc_new(snd_card_t *card, const char *name,
snd_info_entry_t **entryp)
int snd_card_proc_new(struct snd_card *card, const char *name,
struct snd_info_entry **entryp)
{
static snd_device_ops_t ops = {
static struct snd_device_ops ops = {
.dev_free = snd_info_dev_free_entry,
.dev_register = snd_info_dev_register_entry,
.dev_disconnect = snd_info_dev_disconnect_entry,
.dev_unregister = snd_info_dev_unregister_entry
};
snd_info_entry_t *entry;
struct snd_info_entry *entry;
int err;
entry = snd_info_create_card_entry(card, name, card->proc_root);
......@@ -885,7 +885,7 @@ int snd_card_proc_new(snd_card_t *card, const char *name,
*
* Releases the info entry. Don't call this after registered.
*/
void snd_info_free_entry(snd_info_entry_t * entry)
void snd_info_free_entry(struct snd_info_entry * entry)
{
if (entry == NULL)
return;
......@@ -903,7 +903,7 @@ void snd_info_free_entry(snd_info_entry_t * entry)
*
* Returns zero if successful, or a negative error code on failure.
*/
int snd_info_register(snd_info_entry_t * entry)
int snd_info_register(struct snd_info_entry * entry)
{
struct proc_dir_entry *root, *p = NULL;
......@@ -933,7 +933,7 @@ int snd_info_register(snd_info_entry_t * entry)
*
* Returns zero if successful, or a negative error code on failure.
*/
int snd_info_unregister(snd_info_entry_t * entry)
int snd_info_unregister(struct snd_info_entry * entry)
{
struct proc_dir_entry *root;
......@@ -952,9 +952,9 @@ int snd_info_unregister(snd_info_entry_t * entry)
*/
static snd_info_entry_t *snd_info_version_entry = NULL;
static struct snd_info_entry *snd_info_version_entry = NULL;
static void snd_info_version_read(snd_info_entry_t *entry, snd_info_buffer_t * buffer)
static void snd_info_version_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
{
snd_iprintf(buffer,
"Advanced Linux Sound Architecture Driver Version "
......@@ -964,7 +964,7 @@ static void snd_info_version_read(snd_info_entry_t *entry, snd_info_buffer_t * b
static int __init snd_info_version_init(void)
{
snd_info_entry_t *entry;
struct snd_info_entry *entry;
entry = snd_info_create_module_entry(THIS_MODULE, "version", NULL);
if (entry == NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment