projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[S390] remove old z90crypt driver.
[powerpc.git]
/
sound
/
sparc
/
dbri.c
diff --git
a/sound/sparc/dbri.c
b/sound/sparc/dbri.c
index
2164b7d
..
f3ae6e2
100644
(file)
--- a/
sound/sparc/dbri.c
+++ b/
sound/sparc/dbri.c
@@
-46,7
+46,7
@@
*
* I've tried to stick to the following function naming conventions:
* snd_* ALSA stuff
*
* I've tried to stick to the following function naming conventions:
* snd_* ALSA stuff
- * cs4215_* CS4215 codec specfic stuff
+ * cs4215_* CS4215 codec spec
i
fic stuff
* dbri_* DBRI high-level stuff
* other DBRI low-level stuff
*/
* dbri_* DBRI high-level stuff
* other DBRI low-level stuff
*/
@@
-92,7
+92,7
@@
MODULE_PARM_DESC(enable, "Enable Sun DBRI soundcard.");
#define D_USR (1<<4)
#define D_DESC (1<<5)
#define D_USR (1<<4)
#define D_DESC (1<<5)
-static int dbri_debug
= 0
;
+static int dbri_debug;
module_param(dbri_debug, int, 0644);
MODULE_PARM_DESC(dbri_debug, "Debug value for Sun DBRI soundcard.");
module_param(dbri_debug, int, 0644);
MODULE_PARM_DESC(dbri_debug, "Debug value for Sun DBRI soundcard.");
@@
-593,7
+593,7
@@
struct snd_dbri {
/* Return a pointer to dbri_streaminfo */
#define DBRI_STREAM(dbri, substream) &dbri->stream_info[DBRI_STREAMNO(substream)]
/* Return a pointer to dbri_streaminfo */
#define DBRI_STREAM(dbri, substream) &dbri->stream_info[DBRI_STREAMNO(substream)]
-static struct snd_dbri *dbri_list
= NULL;
/* All DBRI devices */
+static struct snd_dbri *dbri_list
;
/* All DBRI devices */
/*
* Short data pipes transmit LSB first. The CS4215 receives MSB first. Grrr.
/*
* Short data pipes transmit LSB first. The CS4215 receives MSB first. Grrr.
@@
-2521,11
+2521,11
@@
void snd_dbri_proc(struct snd_dbri * dbri)
struct snd_info_entry *entry;
if (! snd_card_proc_new(dbri->card, "regs", &entry))
struct snd_info_entry *entry;
if (! snd_card_proc_new(dbri->card, "regs", &entry))
- snd_info_set_text_ops(entry, dbri,
1024,
dbri_regs_read);
+ snd_info_set_text_ops(entry, dbri, dbri_regs_read);
#ifdef DBRI_DEBUG
if (! snd_card_proc_new(dbri->card, "debug", &entry)) {
#ifdef DBRI_DEBUG
if (! snd_card_proc_new(dbri->card, "debug", &entry)) {
- snd_info_set_text_ops(entry, dbri,
4096,
dbri_debug_read);
+ snd_info_set_text_ops(entry, dbri, dbri_debug_read);
entry->mode = S_IFREG | S_IRUGO; /* Readable only. */
}
#endif
entry->mode = S_IFREG | S_IRUGO; /* Readable only. */
}
#endif
@@
-2569,7
+2569,7
@@
static int __init snd_dbri_create(struct snd_card *card,
return -EIO;
}
return -EIO;
}
- err = request_irq(dbri->irq, snd_dbri_interrupt,
SA_SHIRQ
,
+ err = request_irq(dbri->irq, snd_dbri_interrupt,
IRQF_SHARED
,
"DBRI audio", dbri);
if (err) {
printk(KERN_ERR "DBRI: Can't get irq %d\n", dbri->irq);
"DBRI audio", dbri);
if (err) {
printk(KERN_ERR "DBRI: Can't get irq %d\n", dbri->irq);
@@
-2645,9
+2645,9
@@
static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
strcpy(card->driver, "DBRI");
strcpy(card->shortname, "Sun DBRI");
rp = &sdev->resource[0];
strcpy(card->driver, "DBRI");
strcpy(card->shortname, "Sun DBRI");
rp = &sdev->resource[0];
- sprintf(card->longname, "%s at 0x%02lx:0x%0
8lx, irq %s
",
+ sprintf(card->longname, "%s at 0x%02lx:0x%0
16Lx, irq %d
",
card->shortname,
card->shortname,
- rp->flags & 0xffL,
rp->start, __irq_itoa(irq.pri)
);
+ rp->flags & 0xffL,
(unsigned long long)rp->start, irq.pri
);
if ((err = snd_dbri_create(card, sdev, &irq, dev)) < 0) {
snd_card_free(card);
if ((err = snd_dbri_create(card, sdev, &irq, dev)) < 0) {
snd_card_free(card);