aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/ppc/snd_ps3.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index cd9109aaa55e..53c81a547613 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -785,7 +785,7 @@ static struct snd_pcm_ops snd_ps3_pcm_spdif_ops = {
785}; 785};
786 786
787 787
788static int snd_ps3_map_mmio(void) 788static int __devinit snd_ps3_map_mmio(void)
789{ 789{
790 the_card.mapped_mmio_vaddr = 790 the_card.mapped_mmio_vaddr =
791 ioremap(the_card.ps3_dev->m_region->bus_addr, 791 ioremap(the_card.ps3_dev->m_region->bus_addr,
@@ -807,7 +807,7 @@ static void snd_ps3_unmap_mmio(void)
807 the_card.mapped_mmio_vaddr = NULL; 807 the_card.mapped_mmio_vaddr = NULL;
808} 808}
809 809
810static int snd_ps3_allocate_irq(void) 810static int __devinit snd_ps3_allocate_irq(void)
811{ 811{
812 int ret; 812 int ret;
813 u64 lpar_addr, lpar_size; 813 u64 lpar_addr, lpar_size;
@@ -865,7 +865,7 @@ static void snd_ps3_free_irq(void)
865 ps3_irq_plug_destroy(the_card.irq_no); 865 ps3_irq_plug_destroy(the_card.irq_no);
866} 866}
867 867
868static void snd_ps3_audio_set_base_addr(uint64_t ioaddr_start) 868static void __devinit snd_ps3_audio_set_base_addr(uint64_t ioaddr_start)
869{ 869{
870 uint64_t val; 870 uint64_t val;
871 int ret; 871 int ret;
@@ -881,7 +881,7 @@ static void snd_ps3_audio_set_base_addr(uint64_t ioaddr_start)
881 ret); 881 ret);
882} 882}
883 883
884static void snd_ps3_audio_fixup(struct snd_ps3_card_info *card) 884static void __devinit snd_ps3_audio_fixup(struct snd_ps3_card_info *card)
885{ 885{
886 /* 886 /*
887 * avsetting driver seems to never change the followings 887 * avsetting driver seems to never change the followings
@@ -905,7 +905,7 @@ static void snd_ps3_audio_fixup(struct snd_ps3_card_info *card)
905 PS3_AUDIO_AO_3WMCTRL_ASOPLRCK_DEFAULT); 905 PS3_AUDIO_AO_3WMCTRL_ASOPLRCK_DEFAULT);
906} 906}
907 907
908static int snd_ps3_init_avsetting(struct snd_ps3_card_info *card) 908static int __devinit snd_ps3_init_avsetting(struct snd_ps3_card_info *card)
909{ 909{
910 int ret; 910 int ret;
911 pr_debug("%s: start\n", __func__); 911 pr_debug("%s: start\n", __func__);
@@ -927,7 +927,7 @@ static int snd_ps3_init_avsetting(struct snd_ps3_card_info *card)
927 return ret; 927 return ret;
928} 928}
929 929
930static int __init snd_ps3_driver_probe(struct ps3_system_bus_device *dev) 930static int __devinit snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
931{ 931{
932 int i, ret; 932 int i, ret;
933 u64 lpar_addr, lpar_size; 933 u64 lpar_addr, lpar_size;