git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
sound
/
sparc
/
amd7930.c
diff --git
a/sound/sparc/amd7930.c
b/sound/sparc/amd7930.c
index db3e22efd02ee04d44fcd279d9d4b9bea258d493..07962a35f2412f8461681835fcf6c12b7244bfc3 100644
(file)
--- a/
sound/sparc/amd7930.c
+++ b/
sound/sparc/amd7930.c
@@
-491,7
+491,7
@@
static void __amd7930_update_map(struct snd_amd7930 *amd)
__amd7930_write_map(amd);
}
__amd7930_write_map(amd);
}
-static irqreturn_t snd_amd7930_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t snd_amd7930_interrupt(int irq, void *dev_id)
{
struct snd_amd7930 *amd = dev_id;
unsigned int elapsed;
{
struct snd_amd7930 *amd = dev_id;
unsigned int elapsed;
@@
-755,7
+755,7
@@
static struct snd_pcm_ops snd_amd7930_capture_ops = {
.pointer = snd_amd7930_capture_pointer,
};
.pointer = snd_amd7930_capture_pointer,
};
-static int __init snd_amd7930_pcm(struct snd_amd7930 *amd)
+static int __
dev
init snd_amd7930_pcm(struct snd_amd7930 *amd)
{
struct snd_pcm *pcm;
int err;
{
struct snd_pcm *pcm;
int err;
@@
-870,7
+870,7
@@
static int snd_amd7930_put_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem
return change;
}
return change;
}
-static struct snd_kcontrol_new amd7930_controls[] __initdata = {
+static struct snd_kcontrol_new amd7930_controls[] __
dev
initdata = {
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Monitor Volume",
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Monitor Volume",
@@
-900,7
+900,7
@@
static struct snd_kcontrol_new amd7930_controls[] __initdata = {
},
};
},
};
-static int __init snd_amd7930_mixer(struct snd_amd7930 *amd)
+static int __
dev
init snd_amd7930_mixer(struct snd_amd7930 *amd)
{
struct snd_card *card;
int idx, err;
{
struct snd_card *card;
int idx, err;
@@
-945,11
+945,11
@@
static struct snd_device_ops snd_amd7930_dev_ops = {
.dev_free = snd_amd7930_dev_free,
};
.dev_free = snd_amd7930_dev_free,
};
-static int __init snd_amd7930_create(struct snd_card *card,
- struct resource *rp,
- unsigned int reg_size,
- int irq, int dev,
- struct snd_amd7930 **ramd)
+static int __
dev
init snd_amd7930_create(struct snd_card *card,
+
struct resource *rp,
+
unsigned int reg_size,
+
int irq, int dev,
+
struct snd_amd7930 **ramd)
{
unsigned long flags;
struct snd_amd7930 *amd;
{
unsigned long flags;
struct snd_amd7930 *amd;
@@
-1013,7
+1013,7
@@
static int __init snd_amd7930_create(struct snd_card *card,
return 0;
}
return 0;
}
-static int __init amd7930_attach_common(struct resource *rp, int irq)
+static int __
dev
init amd7930_attach_common(struct resource *rp, int irq)
{
static int dev_num;
struct snd_card *card;
{
static int dev_num;
struct snd_card *card;
@@
-1033,10
+1033,10
@@
static int __init amd7930_attach_common(struct resource *rp, int irq)
strcpy(card->driver, "AMD7930");
strcpy(card->shortname, "Sun AMD7930");
strcpy(card->driver, "AMD7930");
strcpy(card->shortname, "Sun AMD7930");
- sprintf(card->longname, "%s at 0x%02lx:0x%08
l
x, irq %d",
+ sprintf(card->longname, "%s at 0x%02lx:0x%08
L
x, irq %d",
card->shortname,
rp->flags & 0xffL,
card->shortname,
rp->flags & 0xffL,
- rp->start,
+
(unsigned long long)
rp->start,
irq);
if ((err = snd_amd7930_create(card, rp,
irq);
if ((err = snd_amd7930_create(card, rp,
@@
-1065,10
+1065,10
@@
out_err:
return err;
}
return err;
}
-static int __init amd7930_obio_attach(struct device_node *dp)
+static int __
dev
init amd7930_obio_attach(struct device_node *dp)
{
{
- struct linux_prom_registers *regs;
- struct linux_prom_irqs *irqp;
+
const
struct linux_prom_registers *regs;
+
const
struct linux_prom_irqs *irqp;
struct resource res, *rp;
int len;
struct resource res, *rp;
int len;