aboutsummaryrefslogtreecommitdiffstats
path: root/sound/sparc
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-06 12:35:25 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-07 01:34:04 -0500
commit32e02a7b690f22b2f56efac929d7c300994ddc4c (patch)
treedd25464ec3612b5afec602dc8804315784b4c77b /sound/sparc
parente74033a858bf36d5763eafea600e07fc917e3592 (diff)
ALSA: sparc: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/sparc')
-rw-r--r--sound/sparc/amd7930.c16
-rw-r--r--sound/sparc/cs4231.c38
-rw-r--r--sound/sparc/dbri.c28
3 files changed, 41 insertions, 41 deletions
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index 5701787c0e6b..174d21fb56e2 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -755,7 +755,7 @@ static struct snd_pcm_ops snd_amd7930_capture_ops = {
755 .pointer = snd_amd7930_capture_pointer, 755 .pointer = snd_amd7930_capture_pointer,
756}; 756};
757 757
758static int __devinit snd_amd7930_pcm(struct snd_amd7930 *amd) 758static int snd_amd7930_pcm(struct snd_amd7930 *amd)
759{ 759{
760 struct snd_pcm *pcm; 760 struct snd_pcm *pcm;
761 int err; 761 int err;
@@ -854,7 +854,7 @@ static int snd_amd7930_put_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem
854 return change; 854 return change;
855} 855}
856 856
857static struct snd_kcontrol_new amd7930_controls[] __devinitdata = { 857static struct snd_kcontrol_new amd7930_controls[] = {
858 { 858 {
859 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 859 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
860 .name = "Monitor Volume", 860 .name = "Monitor Volume",
@@ -884,7 +884,7 @@ static struct snd_kcontrol_new amd7930_controls[] __devinitdata = {
884 }, 884 },
885}; 885};
886 886
887static int __devinit snd_amd7930_mixer(struct snd_amd7930 *amd) 887static int snd_amd7930_mixer(struct snd_amd7930 *amd)
888{ 888{
889 struct snd_card *card; 889 struct snd_card *card;
890 int idx, err; 890 int idx, err;
@@ -933,10 +933,10 @@ static struct snd_device_ops snd_amd7930_dev_ops = {
933 .dev_free = snd_amd7930_dev_free, 933 .dev_free = snd_amd7930_dev_free,
934}; 934};
935 935
936static int __devinit snd_amd7930_create(struct snd_card *card, 936static int snd_amd7930_create(struct snd_card *card,
937 struct platform_device *op, 937 struct platform_device *op,
938 int irq, int dev, 938 int irq, int dev,
939 struct snd_amd7930 **ramd) 939 struct snd_amd7930 **ramd)
940{ 940{
941 struct snd_amd7930 *amd; 941 struct snd_amd7930 *amd;
942 unsigned long flags; 942 unsigned long flags;
@@ -1002,7 +1002,7 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
1002 return 0; 1002 return 0;
1003} 1003}
1004 1004
1005static int __devinit amd7930_sbus_probe(struct platform_device *op) 1005static int amd7930_sbus_probe(struct platform_device *op)
1006{ 1006{
1007 struct resource *rp = &op->resource[0]; 1007 struct resource *rp = &op->resource[0];
1008 static int dev_num; 1008 static int dev_num;
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index f2eabd3f22fd..54aaad2a10f5 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -702,7 +702,7 @@ static int snd_cs4231_timer_stop(struct snd_timer *timer)
702 return 0; 702 return 0;
703} 703}
704 704
705static void __devinit snd_cs4231_init(struct snd_cs4231 *chip) 705static void snd_cs4231_init(struct snd_cs4231 *chip)
706{ 706{
707 unsigned long flags; 707 unsigned long flags;
708 708
@@ -1019,7 +1019,7 @@ static snd_pcm_uframes_t snd_cs4231_capture_pointer(
1019 return bytes_to_frames(substream->runtime, ptr); 1019 return bytes_to_frames(substream->runtime, ptr);
1020} 1020}
1021 1021
1022static int __devinit snd_cs4231_probe(struct snd_cs4231 *chip) 1022static int snd_cs4231_probe(struct snd_cs4231 *chip)
1023{ 1023{
1024 unsigned long flags; 1024 unsigned long flags;
1025 int i; 1025 int i;
@@ -1218,7 +1218,7 @@ static struct snd_pcm_ops snd_cs4231_capture_ops = {
1218 .pointer = snd_cs4231_capture_pointer, 1218 .pointer = snd_cs4231_capture_pointer,
1219}; 1219};
1220 1220
1221static int __devinit snd_cs4231_pcm(struct snd_card *card) 1221static int snd_cs4231_pcm(struct snd_card *card)
1222{ 1222{
1223 struct snd_cs4231 *chip = card->private_data; 1223 struct snd_cs4231 *chip = card->private_data;
1224 struct snd_pcm *pcm; 1224 struct snd_pcm *pcm;
@@ -1247,7 +1247,7 @@ static int __devinit snd_cs4231_pcm(struct snd_card *card)
1247 return 0; 1247 return 0;
1248} 1248}
1249 1249
1250static int __devinit snd_cs4231_timer(struct snd_card *card) 1250static int snd_cs4231_timer(struct snd_card *card)
1251{ 1251{
1252 struct snd_cs4231 *chip = card->private_data; 1252 struct snd_cs4231 *chip = card->private_data;
1253 struct snd_timer *timer; 1253 struct snd_timer *timer;
@@ -1498,7 +1498,7 @@ static int snd_cs4231_put_double(struct snd_kcontrol *kcontrol,
1498 .private_value = (left_reg) | ((right_reg) << 8) | ((shift_left) << 16) | \ 1498 .private_value = (left_reg) | ((right_reg) << 8) | ((shift_left) << 16) | \
1499 ((shift_right) << 19) | ((mask) << 24) | ((invert) << 22) } 1499 ((shift_right) << 19) | ((mask) << 24) | ((invert) << 22) }
1500 1500
1501static struct snd_kcontrol_new snd_cs4231_controls[] __devinitdata = { 1501static struct snd_kcontrol_new snd_cs4231_controls[] = {
1502CS4231_DOUBLE("PCM Playback Switch", 0, CS4231_LEFT_OUTPUT, 1502CS4231_DOUBLE("PCM Playback Switch", 0, CS4231_LEFT_OUTPUT,
1503 CS4231_RIGHT_OUTPUT, 7, 7, 1, 1), 1503 CS4231_RIGHT_OUTPUT, 7, 7, 1, 1),
1504CS4231_DOUBLE("PCM Playback Volume", 0, CS4231_LEFT_OUTPUT, 1504CS4231_DOUBLE("PCM Playback Volume", 0, CS4231_LEFT_OUTPUT,
@@ -1537,7 +1537,7 @@ CS4231_SINGLE("Line Out Switch", 0, CS4231_PIN_CTRL, 6, 1, 1),
1537CS4231_SINGLE("Headphone Out Switch", 0, CS4231_PIN_CTRL, 7, 1, 1) 1537CS4231_SINGLE("Headphone Out Switch", 0, CS4231_PIN_CTRL, 7, 1, 1)
1538}; 1538};
1539 1539
1540static int __devinit snd_cs4231_mixer(struct snd_card *card) 1540static int snd_cs4231_mixer(struct snd_card *card)
1541{ 1541{
1542 struct snd_cs4231 *chip = card->private_data; 1542 struct snd_cs4231 *chip = card->private_data;
1543 int err, idx; 1543 int err, idx;
@@ -1558,7 +1558,7 @@ static int __devinit snd_cs4231_mixer(struct snd_card *card)
1558 1558
1559static int dev; 1559static int dev;
1560 1560
1561static int __devinit cs4231_attach_begin(struct snd_card **rcard) 1561static int cs4231_attach_begin(struct snd_card **rcard)
1562{ 1562{
1563 struct snd_card *card; 1563 struct snd_card *card;
1564 struct snd_cs4231 *chip; 1564 struct snd_cs4231 *chip;
@@ -1589,7 +1589,7 @@ static int __devinit cs4231_attach_begin(struct snd_card **rcard)
1589 return 0; 1589 return 0;
1590} 1590}
1591 1591
1592static int __devinit cs4231_attach_finish(struct snd_card *card) 1592static int cs4231_attach_finish(struct snd_card *card)
1593{ 1593{
1594 struct snd_cs4231 *chip = card->private_data; 1594 struct snd_cs4231 *chip = card->private_data;
1595 int err; 1595 int err;
@@ -1793,9 +1793,9 @@ static struct snd_device_ops snd_cs4231_sbus_dev_ops = {
1793 .dev_free = snd_cs4231_sbus_dev_free, 1793 .dev_free = snd_cs4231_sbus_dev_free,
1794}; 1794};
1795 1795
1796static int __devinit snd_cs4231_sbus_create(struct snd_card *card, 1796static int snd_cs4231_sbus_create(struct snd_card *card,
1797 struct platform_device *op, 1797 struct platform_device *op,
1798 int dev) 1798 int dev)
1799{ 1799{
1800 struct snd_cs4231 *chip = card->private_data; 1800 struct snd_cs4231 *chip = card->private_data;
1801 int err; 1801 int err;
@@ -1856,7 +1856,7 @@ static int __devinit snd_cs4231_sbus_create(struct snd_card *card,
1856 return 0; 1856 return 0;
1857} 1857}
1858 1858
1859static int __devinit cs4231_sbus_probe(struct platform_device *op) 1859static int cs4231_sbus_probe(struct platform_device *op)
1860{ 1860{
1861 struct resource *rp = &op->resource[0]; 1861 struct resource *rp = &op->resource[0];
1862 struct snd_card *card; 1862 struct snd_card *card;
@@ -1959,9 +1959,9 @@ static struct snd_device_ops snd_cs4231_ebus_dev_ops = {
1959 .dev_free = snd_cs4231_ebus_dev_free, 1959 .dev_free = snd_cs4231_ebus_dev_free,
1960}; 1960};
1961 1961
1962static int __devinit snd_cs4231_ebus_create(struct snd_card *card, 1962static int snd_cs4231_ebus_create(struct snd_card *card,
1963 struct platform_device *op, 1963 struct platform_device *op,
1964 int dev) 1964 int dev)
1965{ 1965{
1966 struct snd_cs4231 *chip = card->private_data; 1966 struct snd_cs4231 *chip = card->private_data;
1967 int err; 1967 int err;
@@ -2048,7 +2048,7 @@ static int __devinit snd_cs4231_ebus_create(struct snd_card *card,
2048 return 0; 2048 return 0;
2049} 2049}
2050 2050
2051static int __devinit cs4231_ebus_probe(struct platform_device *op) 2051static int cs4231_ebus_probe(struct platform_device *op)
2052{ 2052{
2053 struct snd_card *card; 2053 struct snd_card *card;
2054 int err; 2054 int err;
@@ -2072,7 +2072,7 @@ static int __devinit cs4231_ebus_probe(struct platform_device *op)
2072} 2072}
2073#endif 2073#endif
2074 2074
2075static int __devinit cs4231_probe(struct platform_device *op) 2075static int cs4231_probe(struct platform_device *op)
2076{ 2076{
2077#ifdef EBUS_SUPPORT 2077#ifdef EBUS_SUPPORT
2078 if (!strcmp(op->dev.of_node->parent->name, "ebus")) 2078 if (!strcmp(op->dev.of_node->parent->name, "ebus"))
@@ -2086,7 +2086,7 @@ static int __devinit cs4231_probe(struct platform_device *op)
2086 return -ENODEV; 2086 return -ENODEV;
2087} 2087}
2088 2088
2089static int __devexit cs4231_remove(struct platform_device *op) 2089static int cs4231_remove(struct platform_device *op)
2090{ 2090{
2091 struct snd_cs4231 *chip = dev_get_drvdata(&op->dev); 2091 struct snd_cs4231 *chip = dev_get_drvdata(&op->dev);
2092 2092
@@ -2115,7 +2115,7 @@ static struct platform_driver cs4231_driver = {
2115 .of_match_table = cs4231_match, 2115 .of_match_table = cs4231_match,
2116 }, 2116 },
2117 .probe = cs4231_probe, 2117 .probe = cs4231_probe,
2118 .remove = __devexit_p(cs4231_remove), 2118 .remove = cs4231_remove,
2119}; 2119};
2120 2120
2121module_platform_driver(cs4231_driver); 2121module_platform_driver(cs4231_driver);
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index ae35f5342e10..75e6016d3efe 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -745,7 +745,7 @@ static void dbri_reset(struct snd_dbri *dbri)
745} 745}
746 746
747/* Lock must not be held before calling this */ 747/* Lock must not be held before calling this */
748static void __devinit dbri_initialize(struct snd_dbri *dbri) 748static void dbri_initialize(struct snd_dbri *dbri)
749{ 749{
750 s32 *cmd; 750 s32 *cmd;
751 u32 dma_addr; 751 u32 dma_addr;
@@ -1305,7 +1305,7 @@ to the DBRI via the CHI interface and few of the DBRI's PIO pins.
1305 * Lock must not be held before calling it. 1305 * Lock must not be held before calling it.
1306 1306
1307*/ 1307*/
1308static __devinit void cs4215_setup_pipes(struct snd_dbri *dbri) 1308static void cs4215_setup_pipes(struct snd_dbri *dbri)
1309{ 1309{
1310 unsigned long flags; 1310 unsigned long flags;
1311 1311
@@ -1338,7 +1338,7 @@ static __devinit void cs4215_setup_pipes(struct snd_dbri *dbri)
1338 dbri_cmdwait(dbri); 1338 dbri_cmdwait(dbri);
1339} 1339}
1340 1340
1341static __devinit int cs4215_init_data(struct cs4215 *mm) 1341static int cs4215_init_data(struct cs4215 *mm)
1342{ 1342{
1343 /* 1343 /*
1344 * No action, memory resetting only. 1344 * No action, memory resetting only.
@@ -1630,7 +1630,7 @@ static int cs4215_prepare(struct snd_dbri *dbri, unsigned int rate,
1630/* 1630/*
1631 * 1631 *
1632 */ 1632 */
1633static __devinit int cs4215_init(struct snd_dbri *dbri) 1633static int cs4215_init(struct snd_dbri *dbri)
1634{ 1634{
1635 u32 reg2 = sbus_readl(dbri->regs + REG2); 1635 u32 reg2 = sbus_readl(dbri->regs + REG2);
1636 dprintk(D_MM, "cs4215_init: reg2=0x%x\n", reg2); 1636 dprintk(D_MM, "cs4215_init: reg2=0x%x\n", reg2);
@@ -2217,7 +2217,7 @@ static struct snd_pcm_ops snd_dbri_ops = {
2217 .pointer = snd_dbri_pointer, 2217 .pointer = snd_dbri_pointer,
2218}; 2218};
2219 2219
2220static int __devinit snd_dbri_pcm(struct snd_card *card) 2220static int snd_dbri_pcm(struct snd_card *card)
2221{ 2221{
2222 struct snd_pcm *pcm; 2222 struct snd_pcm *pcm;
2223 int err; 2223 int err;
@@ -2409,7 +2409,7 @@ static int snd_cs4215_put_single(struct snd_kcontrol *kcontrol,
2409 .private_value = (entry) | ((shift) << 8) | ((mask) << 16) | \ 2409 .private_value = (entry) | ((shift) << 8) | ((mask) << 16) | \
2410 ((invert) << 24) }, 2410 ((invert) << 24) },
2411 2411
2412static struct snd_kcontrol_new dbri_controls[] __devinitdata = { 2412static struct snd_kcontrol_new dbri_controls[] = {
2413 { 2413 {
2414 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 2414 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
2415 .name = "Playback Volume", 2415 .name = "Playback Volume",
@@ -2436,7 +2436,7 @@ static struct snd_kcontrol_new dbri_controls[] __devinitdata = {
2436 CS4215_SINGLE("Mic boost", 4, 4, 1, 1) 2436 CS4215_SINGLE("Mic boost", 4, 4, 1, 1)
2437}; 2437};
2438 2438
2439static int __devinit snd_dbri_mixer(struct snd_card *card) 2439static int snd_dbri_mixer(struct snd_card *card)
2440{ 2440{
2441 int idx, err; 2441 int idx, err;
2442 struct snd_dbri *dbri; 2442 struct snd_dbri *dbri;
@@ -2500,7 +2500,7 @@ static void dbri_debug_read(struct snd_info_entry *entry,
2500} 2500}
2501#endif 2501#endif
2502 2502
2503static void __devinit snd_dbri_proc(struct snd_card *card) 2503static void snd_dbri_proc(struct snd_card *card)
2504{ 2504{
2505 struct snd_dbri *dbri = card->private_data; 2505 struct snd_dbri *dbri = card->private_data;
2506 struct snd_info_entry *entry; 2506 struct snd_info_entry *entry;
@@ -2523,9 +2523,9 @@ static void __devinit snd_dbri_proc(struct snd_card *card)
2523*/ 2523*/
2524static void snd_dbri_free(struct snd_dbri *dbri); 2524static void snd_dbri_free(struct snd_dbri *dbri);
2525 2525
2526static int __devinit snd_dbri_create(struct snd_card *card, 2526static int snd_dbri_create(struct snd_card *card,
2527 struct platform_device *op, 2527 struct platform_device *op,
2528 int irq, int dev) 2528 int irq, int dev)
2529{ 2529{
2530 struct snd_dbri *dbri = card->private_data; 2530 struct snd_dbri *dbri = card->private_data;
2531 int err; 2531 int err;
@@ -2593,7 +2593,7 @@ static void snd_dbri_free(struct snd_dbri *dbri)
2593 (void *)dbri->dma, dbri->dma_dvma); 2593 (void *)dbri->dma, dbri->dma_dvma);
2594} 2594}
2595 2595
2596static int __devinit dbri_probe(struct platform_device *op) 2596static int dbri_probe(struct platform_device *op)
2597{ 2597{
2598 struct snd_dbri *dbri; 2598 struct snd_dbri *dbri;
2599 struct resource *rp; 2599 struct resource *rp;
@@ -2663,7 +2663,7 @@ _err:
2663 return err; 2663 return err;
2664} 2664}
2665 2665
2666static int __devexit dbri_remove(struct platform_device *op) 2666static int dbri_remove(struct platform_device *op)
2667{ 2667{
2668 struct snd_card *card = dev_get_drvdata(&op->dev); 2668 struct snd_card *card = dev_get_drvdata(&op->dev);
2669 2669
@@ -2694,7 +2694,7 @@ static struct platform_driver dbri_sbus_driver = {
2694 .of_match_table = dbri_match, 2694 .of_match_table = dbri_match,
2695 }, 2695 },
2696 .probe = dbri_probe, 2696 .probe = dbri_probe,
2697 .remove = __devexit_p(dbri_remove), 2697 .remove = dbri_remove,
2698}; 2698};
2699 2699
2700module_platform_driver(dbri_sbus_driver); 2700module_platform_driver(dbri_sbus_driver);