diff options
author | David S. Miller <davem@davemloft.net> | 2009-04-07 03:45:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-08 06:28:37 -0400 |
commit | 7816238a539bf56311f04e7ff17076f66d5c902a (patch) | |
tree | 61154737584b68b70856686a5184f10544c92cbe | |
parent | 9a2ed5cc9ef6cb60abd3ea66d7be549d8023581a (diff) |
sparc: Fix section mismatch warnings in cs4231 sound driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | sound/sparc/cs4231.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 7d93fa705ccf..8d13d933087d 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
@@ -703,7 +703,7 @@ static int snd_cs4231_timer_stop(struct snd_timer *timer) | |||
703 | return 0; | 703 | return 0; |
704 | } | 704 | } |
705 | 705 | ||
706 | static void __init snd_cs4231_init(struct snd_cs4231 *chip) | 706 | static void __devinit snd_cs4231_init(struct snd_cs4231 *chip) |
707 | { | 707 | { |
708 | unsigned long flags; | 708 | unsigned long flags; |
709 | 709 | ||
@@ -1020,7 +1020,7 @@ static snd_pcm_uframes_t snd_cs4231_capture_pointer( | |||
1020 | return bytes_to_frames(substream->runtime, ptr); | 1020 | return bytes_to_frames(substream->runtime, ptr); |
1021 | } | 1021 | } |
1022 | 1022 | ||
1023 | static int __init snd_cs4231_probe(struct snd_cs4231 *chip) | 1023 | static int __devinit snd_cs4231_probe(struct snd_cs4231 *chip) |
1024 | { | 1024 | { |
1025 | unsigned long flags; | 1025 | unsigned long flags; |
1026 | int i; | 1026 | int i; |
@@ -1219,7 +1219,7 @@ static struct snd_pcm_ops snd_cs4231_capture_ops = { | |||
1219 | .pointer = snd_cs4231_capture_pointer, | 1219 | .pointer = snd_cs4231_capture_pointer, |
1220 | }; | 1220 | }; |
1221 | 1221 | ||
1222 | static int __init snd_cs4231_pcm(struct snd_card *card) | 1222 | static int __devinit snd_cs4231_pcm(struct snd_card *card) |
1223 | { | 1223 | { |
1224 | struct snd_cs4231 *chip = card->private_data; | 1224 | struct snd_cs4231 *chip = card->private_data; |
1225 | struct snd_pcm *pcm; | 1225 | struct snd_pcm *pcm; |
@@ -1248,7 +1248,7 @@ static int __init snd_cs4231_pcm(struct snd_card *card) | |||
1248 | return 0; | 1248 | return 0; |
1249 | } | 1249 | } |
1250 | 1250 | ||
1251 | static int __init snd_cs4231_timer(struct snd_card *card) | 1251 | static int __devinit snd_cs4231_timer(struct snd_card *card) |
1252 | { | 1252 | { |
1253 | struct snd_cs4231 *chip = card->private_data; | 1253 | struct snd_cs4231 *chip = card->private_data; |
1254 | struct snd_timer *timer; | 1254 | struct snd_timer *timer; |
@@ -1499,7 +1499,7 @@ static int snd_cs4231_put_double(struct snd_kcontrol *kcontrol, | |||
1499 | .private_value = (left_reg) | ((right_reg) << 8) | ((shift_left) << 16) | \ | 1499 | .private_value = (left_reg) | ((right_reg) << 8) | ((shift_left) << 16) | \ |
1500 | ((shift_right) << 19) | ((mask) << 24) | ((invert) << 22) } | 1500 | ((shift_right) << 19) | ((mask) << 24) | ((invert) << 22) } |
1501 | 1501 | ||
1502 | static struct snd_kcontrol_new snd_cs4231_controls[] __initdata = { | 1502 | static struct snd_kcontrol_new snd_cs4231_controls[] __devinitdata = { |
1503 | CS4231_DOUBLE("PCM Playback Switch", 0, CS4231_LEFT_OUTPUT, | 1503 | CS4231_DOUBLE("PCM Playback Switch", 0, CS4231_LEFT_OUTPUT, |
1504 | CS4231_RIGHT_OUTPUT, 7, 7, 1, 1), | 1504 | CS4231_RIGHT_OUTPUT, 7, 7, 1, 1), |
1505 | CS4231_DOUBLE("PCM Playback Volume", 0, CS4231_LEFT_OUTPUT, | 1505 | CS4231_DOUBLE("PCM Playback Volume", 0, CS4231_LEFT_OUTPUT, |
@@ -1538,7 +1538,7 @@ CS4231_SINGLE("Line Out Switch", 0, CS4231_PIN_CTRL, 6, 1, 1), | |||
1538 | CS4231_SINGLE("Headphone Out Switch", 0, CS4231_PIN_CTRL, 7, 1, 1) | 1538 | CS4231_SINGLE("Headphone Out Switch", 0, CS4231_PIN_CTRL, 7, 1, 1) |
1539 | }; | 1539 | }; |
1540 | 1540 | ||
1541 | static int __init snd_cs4231_mixer(struct snd_card *card) | 1541 | static int __devinit snd_cs4231_mixer(struct snd_card *card) |
1542 | { | 1542 | { |
1543 | struct snd_cs4231 *chip = card->private_data; | 1543 | struct snd_cs4231 *chip = card->private_data; |
1544 | int err, idx; | 1544 | int err, idx; |
@@ -1559,7 +1559,7 @@ static int __init snd_cs4231_mixer(struct snd_card *card) | |||
1559 | 1559 | ||
1560 | static int dev; | 1560 | static int dev; |
1561 | 1561 | ||
1562 | static int __init cs4231_attach_begin(struct snd_card **rcard) | 1562 | static int __devinit cs4231_attach_begin(struct snd_card **rcard) |
1563 | { | 1563 | { |
1564 | struct snd_card *card; | 1564 | struct snd_card *card; |
1565 | struct snd_cs4231 *chip; | 1565 | struct snd_cs4231 *chip; |
@@ -1590,7 +1590,7 @@ static int __init cs4231_attach_begin(struct snd_card **rcard) | |||
1590 | return 0; | 1590 | return 0; |
1591 | } | 1591 | } |
1592 | 1592 | ||
1593 | static int __init cs4231_attach_finish(struct snd_card *card) | 1593 | static int __devinit cs4231_attach_finish(struct snd_card *card) |
1594 | { | 1594 | { |
1595 | struct snd_cs4231 *chip = card->private_data; | 1595 | struct snd_cs4231 *chip = card->private_data; |
1596 | int err; | 1596 | int err; |
@@ -1794,9 +1794,9 @@ static struct snd_device_ops snd_cs4231_sbus_dev_ops = { | |||
1794 | .dev_free = snd_cs4231_sbus_dev_free, | 1794 | .dev_free = snd_cs4231_sbus_dev_free, |
1795 | }; | 1795 | }; |
1796 | 1796 | ||
1797 | static int __init snd_cs4231_sbus_create(struct snd_card *card, | 1797 | static int __devinit snd_cs4231_sbus_create(struct snd_card *card, |
1798 | struct of_device *op, | 1798 | struct of_device *op, |
1799 | int dev) | 1799 | int dev) |
1800 | { | 1800 | { |
1801 | struct snd_cs4231 *chip = card->private_data; | 1801 | struct snd_cs4231 *chip = card->private_data; |
1802 | int err; | 1802 | int err; |
@@ -1960,9 +1960,9 @@ static struct snd_device_ops snd_cs4231_ebus_dev_ops = { | |||
1960 | .dev_free = snd_cs4231_ebus_dev_free, | 1960 | .dev_free = snd_cs4231_ebus_dev_free, |
1961 | }; | 1961 | }; |
1962 | 1962 | ||
1963 | static int __init snd_cs4231_ebus_create(struct snd_card *card, | 1963 | static int __devinit snd_cs4231_ebus_create(struct snd_card *card, |
1964 | struct of_device *op, | 1964 | struct of_device *op, |
1965 | int dev) | 1965 | int dev) |
1966 | { | 1966 | { |
1967 | struct snd_cs4231 *chip = card->private_data; | 1967 | struct snd_cs4231 *chip = card->private_data; |
1968 | int err; | 1968 | int err; |