aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/asihpi/asihpi.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/asihpi/asihpi.c')
-rw-r--r--sound/pci/asihpi/asihpi.c55
1 files changed, 27 insertions, 28 deletions
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index eedc017c1cd8..3536b076b529 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -1235,8 +1235,7 @@ static struct snd_pcm_ops snd_card_asihpi_capture_mmap_ops = {
1235 .pointer = snd_card_asihpi_capture_pointer, 1235 .pointer = snd_card_asihpi_capture_pointer,
1236}; 1236};
1237 1237
1238static int __devinit snd_card_asihpi_pcm_new( 1238static int snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi, int device)
1239 struct snd_card_asihpi *asihpi, int device)
1240{ 1239{
1241 struct snd_pcm *pcm; 1240 struct snd_pcm *pcm;
1242 int err; 1241 int err;
@@ -1497,8 +1496,8 @@ static int snd_asihpi_volume_mute_put(struct snd_kcontrol *kcontrol,
1497 return change; 1496 return change;
1498} 1497}
1499 1498
1500static int __devinit snd_asihpi_volume_add(struct snd_card_asihpi *asihpi, 1499static int snd_asihpi_volume_add(struct snd_card_asihpi *asihpi,
1501 struct hpi_control *hpi_ctl) 1500 struct hpi_control *hpi_ctl)
1502{ 1501{
1503 struct snd_card *card = asihpi->card; 1502 struct snd_card *card = asihpi->card;
1504 struct snd_kcontrol_new snd_control; 1503 struct snd_kcontrol_new snd_control;
@@ -1593,8 +1592,8 @@ static int snd_asihpi_level_put(struct snd_kcontrol *kcontrol,
1593 1592
1594static const DECLARE_TLV_DB_SCALE(db_scale_level, -1000, 100, 0); 1593static const DECLARE_TLV_DB_SCALE(db_scale_level, -1000, 100, 0);
1595 1594
1596static int __devinit snd_asihpi_level_add(struct snd_card_asihpi *asihpi, 1595static int snd_asihpi_level_add(struct snd_card_asihpi *asihpi,
1597 struct hpi_control *hpi_ctl) 1596 struct hpi_control *hpi_ctl)
1598{ 1597{
1599 struct snd_card *card = asihpi->card; 1598 struct snd_card *card = asihpi->card;
1600 struct snd_kcontrol_new snd_control; 1599 struct snd_kcontrol_new snd_control;
@@ -1715,8 +1714,8 @@ static int snd_asihpi_aesebu_rxstatus_get(struct snd_kcontrol *kcontrol,
1715 return 0; 1714 return 0;
1716} 1715}
1717 1716
1718static int __devinit snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi, 1717static int snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,
1719 struct hpi_control *hpi_ctl) 1718 struct hpi_control *hpi_ctl)
1720{ 1719{
1721 struct snd_card *card = asihpi->card; 1720 struct snd_card *card = asihpi->card;
1722 struct snd_kcontrol_new snd_control; 1721 struct snd_kcontrol_new snd_control;
@@ -1753,8 +1752,8 @@ static int snd_asihpi_aesebu_tx_format_put(struct snd_kcontrol *kcontrol,
1753} 1752}
1754 1753
1755 1754
1756static int __devinit snd_asihpi_aesebu_tx_add(struct snd_card_asihpi *asihpi, 1755static int snd_asihpi_aesebu_tx_add(struct snd_card_asihpi *asihpi,
1757 struct hpi_control *hpi_ctl) 1756 struct hpi_control *hpi_ctl)
1758{ 1757{
1759 struct snd_card *card = asihpi->card; 1758 struct snd_card *card = asihpi->card;
1760 struct snd_kcontrol_new snd_control; 1759 struct snd_kcontrol_new snd_control;
@@ -1996,8 +1995,8 @@ static int snd_asihpi_tuner_freq_put(struct snd_kcontrol *kcontrol,
1996} 1995}
1997 1996
1998/* Tuner control group initializer */ 1997/* Tuner control group initializer */
1999static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi, 1998static int snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,
2000 struct hpi_control *hpi_ctl) 1999 struct hpi_control *hpi_ctl)
2001{ 2000{
2002 struct snd_card *card = asihpi->card; 2001 struct snd_card *card = asihpi->card;
2003 struct snd_kcontrol_new snd_control; 2002 struct snd_kcontrol_new snd_control;
@@ -2100,8 +2099,8 @@ static int snd_asihpi_meter_get(struct snd_kcontrol *kcontrol,
2100 return 0; 2099 return 0;
2101} 2100}
2102 2101
2103static int __devinit snd_asihpi_meter_add(struct snd_card_asihpi *asihpi, 2102static int snd_asihpi_meter_add(struct snd_card_asihpi *asihpi,
2104 struct hpi_control *hpi_ctl, int subidx) 2103 struct hpi_control *hpi_ctl, int subidx)
2105{ 2104{
2106 struct snd_card *card = asihpi->card; 2105 struct snd_card *card = asihpi->card;
2107 struct snd_kcontrol_new snd_control; 2106 struct snd_kcontrol_new snd_control;
@@ -2214,8 +2213,8 @@ static int snd_asihpi_mux_put(struct snd_kcontrol *kcontrol,
2214} 2213}
2215 2214
2216 2215
2217static int __devinit snd_asihpi_mux_add(struct snd_card_asihpi *asihpi, 2216static int snd_asihpi_mux_add(struct snd_card_asihpi *asihpi,
2218 struct hpi_control *hpi_ctl) 2217 struct hpi_control *hpi_ctl)
2219{ 2218{
2220 struct snd_card *card = asihpi->card; 2219 struct snd_card *card = asihpi->card;
2221 struct snd_kcontrol_new snd_control; 2220 struct snd_kcontrol_new snd_control;
@@ -2303,8 +2302,8 @@ static int snd_asihpi_cmode_put(struct snd_kcontrol *kcontrol,
2303} 2302}
2304 2303
2305 2304
2306static int __devinit snd_asihpi_cmode_add(struct snd_card_asihpi *asihpi, 2305static int snd_asihpi_cmode_add(struct snd_card_asihpi *asihpi,
2307 struct hpi_control *hpi_ctl) 2306 struct hpi_control *hpi_ctl)
2308{ 2307{
2309 struct snd_card *card = asihpi->card; 2308 struct snd_card *card = asihpi->card;
2310 struct snd_kcontrol_new snd_control; 2309 struct snd_kcontrol_new snd_control;
@@ -2471,8 +2470,8 @@ static int snd_asihpi_clkrate_get(struct snd_kcontrol *kcontrol,
2471 return 0; 2470 return 0;
2472} 2471}
2473 2472
2474static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi, 2473static int snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
2475 struct hpi_control *hpi_ctl) 2474 struct hpi_control *hpi_ctl)
2476{ 2475{
2477 struct snd_card *card = asihpi->card; 2476 struct snd_card *card = asihpi->card;
2478 struct snd_kcontrol_new snd_control; 2477 struct snd_kcontrol_new snd_control;
@@ -2548,7 +2547,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
2548 Mixer 2547 Mixer
2549 ------------------------------------------------------------*/ 2548 ------------------------------------------------------------*/
2550 2549
2551static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi) 2550static int snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
2552{ 2551{
2553 struct snd_card *card = asihpi->card; 2552 struct snd_card *card = asihpi->card;
2554 unsigned int idx = 0; 2553 unsigned int idx = 0;
@@ -2722,7 +2721,7 @@ snd_asihpi_proc_read(struct snd_info_entry *entry,
2722 } 2721 }
2723} 2722}
2724 2723
2725static void __devinit snd_asihpi_proc_init(struct snd_card_asihpi *asihpi) 2724static void snd_asihpi_proc_init(struct snd_card_asihpi *asihpi)
2726{ 2725{
2727 struct snd_info_entry *entry; 2726 struct snd_info_entry *entry;
2728 2727
@@ -2764,8 +2763,8 @@ static int snd_asihpi_hpi_ioctl(struct snd_hwdep *hw, struct file *file,
2764/* results in /dev/snd/hwC#D0 file for each card with index # 2763/* results in /dev/snd/hwC#D0 file for each card with index #
2765 also /proc/asound/hwdep will contain '#-00: asihpi (HPI) for each card' 2764 also /proc/asound/hwdep will contain '#-00: asihpi (HPI) for each card'
2766*/ 2765*/
2767static int __devinit snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi, 2766static int snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi,
2768 int device, struct snd_hwdep **rhwdep) 2767 int device, struct snd_hwdep **rhwdep)
2769{ 2768{
2770 struct snd_hwdep *hw; 2769 struct snd_hwdep *hw;
2771 int err; 2770 int err;
@@ -2789,8 +2788,8 @@ static int __devinit snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi,
2789/*------------------------------------------------------------ 2788/*------------------------------------------------------------
2790 CARD 2789 CARD
2791 ------------------------------------------------------------*/ 2790 ------------------------------------------------------------*/
2792static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev, 2791static int snd_asihpi_probe(struct pci_dev *pci_dev,
2793 const struct pci_device_id *pci_id) 2792 const struct pci_device_id *pci_id)
2794{ 2793{
2795 int err; 2794 int err;
2796 struct hpi_adapter *hpi; 2795 struct hpi_adapter *hpi;
@@ -2944,7 +2943,7 @@ __nodev:
2944 2943
2945} 2944}
2946 2945
2947static void __devexit snd_asihpi_remove(struct pci_dev *pci_dev) 2946static void snd_asihpi_remove(struct pci_dev *pci_dev)
2948{ 2947{
2949 struct hpi_adapter *hpi = pci_get_drvdata(pci_dev); 2948 struct hpi_adapter *hpi = pci_get_drvdata(pci_dev);
2950 snd_card_free(hpi->snd_card); 2949 snd_card_free(hpi->snd_card);
@@ -2967,7 +2966,7 @@ static struct pci_driver driver = {
2967 .name = KBUILD_MODNAME, 2966 .name = KBUILD_MODNAME,
2968 .id_table = asihpi_pci_tbl, 2967 .id_table = asihpi_pci_tbl,
2969 .probe = snd_asihpi_probe, 2968 .probe = snd_asihpi_probe,
2970 .remove = __devexit_p(snd_asihpi_remove), 2969 .remove = snd_asihpi_remove,
2971#ifdef CONFIG_PM_SLEEP 2970#ifdef CONFIG_PM_SLEEP
2972/* .suspend = snd_asihpi_suspend, 2971/* .suspend = snd_asihpi_suspend,
2973 .resume = snd_asihpi_resume, */ 2972 .resume = snd_asihpi_resume, */
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-28 03:43:46 -0500