Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 148524
b: refs/heads/master
c: 2233123
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Takashi Iwai committed Jun 10, 2009
1 parent 6b76437 commit dba8076
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cb6492e4a4e68281358510f0ffe2b0c4972ec166
refs/heads/master: 2233123f2776f29d3ac31df1fd1dc40c44d337a5
12 changes: 6 additions & 6 deletions trunk/sound/ppc/snd_ps3.c
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ static struct snd_pcm_ops snd_ps3_pcm_spdif_ops = {
};


static int snd_ps3_map_mmio(void)
static int __devinit snd_ps3_map_mmio(void)
{
the_card.mapped_mmio_vaddr =
ioremap(the_card.ps3_dev->m_region->bus_addr,
Expand All @@ -807,7 +807,7 @@ static void snd_ps3_unmap_mmio(void)
the_card.mapped_mmio_vaddr = NULL;
}

static int snd_ps3_allocate_irq(void)
static int __devinit snd_ps3_allocate_irq(void)
{
int ret;
u64 lpar_addr, lpar_size;
Expand Down Expand Up @@ -865,7 +865,7 @@ static void snd_ps3_free_irq(void)
ps3_irq_plug_destroy(the_card.irq_no);
}

static void snd_ps3_audio_set_base_addr(uint64_t ioaddr_start)
static void __devinit snd_ps3_audio_set_base_addr(uint64_t ioaddr_start)
{
uint64_t val;
int ret;
Expand All @@ -881,7 +881,7 @@ static void snd_ps3_audio_set_base_addr(uint64_t ioaddr_start)
ret);
}

static void snd_ps3_audio_fixup(struct snd_ps3_card_info *card)
static void __devinit snd_ps3_audio_fixup(struct snd_ps3_card_info *card)
{
/*
* avsetting driver seems to never change the followings
Expand All @@ -905,7 +905,7 @@ static void snd_ps3_audio_fixup(struct snd_ps3_card_info *card)
PS3_AUDIO_AO_3WMCTRL_ASOPLRCK_DEFAULT);
}

static int snd_ps3_init_avsetting(struct snd_ps3_card_info *card)
static int __devinit snd_ps3_init_avsetting(struct snd_ps3_card_info *card)
{
int ret;
pr_debug("%s: start\n", __func__);
Expand All @@ -927,7 +927,7 @@ static int snd_ps3_init_avsetting(struct snd_ps3_card_info *card)
return ret;
}

static int __init snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
static int __devinit snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
{
int i, ret;
u64 lpar_addr, lpar_size;
Expand Down

0 comments on commit dba8076

Please sign in to comment.