add audio

hc

2023-12-11 1f93a7dfd1f8d5ff7a5c53246c7534fe2332d6f4

 kernel/sound/pci/ctxfi/cthw20k1.c
..
..
@@ -1,9 +1,6 @@
1
-/**
1
+// SPDX-License-Identifier: GPL-2.0-only
2
+/*
2
3
  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.
3
- *
4
- * This source file is released under GPL v2 license (no other versions).
5
- * See the COPYING file included in the main directory of this source
6
- * distribution for the license terms and conditions.
7
4
  *
8
5
  * @File	cthw20k1.c
9
6
  *
..
..
@@ -12,7 +9,6 @@
12
9
  *
13
10
  * @Author	Liu Chun
14
11
  * @Date 	Jun 24 2008
15
- *
16
12
  */
17
13
 
18
14
 #include <linux/types.h>
..
..
@@ -172,7 +168,7 @@
172
168
 
173
169
 static int src_put_rsc_ctrl_blk(void *blk)
174
170
 {
175
-	kfree((struct src_rsc_ctrl_blk *)blk);
171
+	kfree(blk);
176
172
 
177
173
 	return 0;
178
174
 }
..
..
@@ -498,7 +494,7 @@
498
494
 
499
495
 static int src_mgr_put_ctrl_blk(void *blk)
500
496
 {
501
-	kfree((struct src_mgr_ctrl_blk *)blk);
497
+	kfree(blk);
502
498
 
503
499
 	return 0;
504
500
 }
..
..
@@ -519,7 +515,7 @@
519
515
 
520
516
 static int srcimp_mgr_put_ctrl_blk(void *blk)
521
517
 {
522
-	kfree((struct srcimp_mgr_ctrl_blk *)blk);
518
+	kfree(blk);
523
519
 
524
520
 	return 0;
525
521
 }
..
..
@@ -706,7 +702,7 @@
706
702
 
707
703
 static int amixer_rsc_put_ctrl_blk(void *blk)
708
704
 {
709
-	kfree((struct amixer_rsc_ctrl_blk *)blk);
705
+	kfree(blk);
710
706
 
711
707
 	return 0;
712
708
 }
..
..
@@ -913,7 +909,7 @@
913
909
 
914
910
 static int dai_put_ctrl_blk(void *blk)
915
911
 {
916
-	kfree((struct dai_ctrl_blk *)blk);
912
+	kfree(blk);
917
913
 
918
914
 	return 0;
919
915
 }
..
..
@@ -962,7 +958,7 @@
962
958
 
963
959
 static int dao_put_ctrl_blk(void *blk)
964
960
 {
965
-	kfree((struct dao_ctrl_blk *)blk);
961
+	kfree(blk);
966
962
 
967
963
 	return 0;
968
964
 }
..
..
@@ -1160,7 +1156,7 @@
1160
1156
 
1161
1157
 static int daio_mgr_put_ctrl_blk(void *blk)
1162
1158
 {
1163
-	kfree((struct daio_mgr_ctrl_blk *)blk);
1159
+	kfree(blk);
1164
1160
 
1165
1161
 	return 0;
1166
1162
 }
..
..
@@ -1941,6 +1937,7 @@
1941
1937
 			goto error2;
1942
1938
 		}
1943
1939
 		hw->irq = pci->irq;
1940
+		hw->card->sync_irq = hw->irq;
1944
1941
 	}
1945
1942
 
1946
1943
 	pci_set_master(pci);
..
..
@@ -1966,9 +1963,6 @@
1966
1963
 	data = hw_read_20kx(hw, PLLCTL);
1967
1964
 	hw_write_20kx(hw, PLLCTL, (data & (~(0x0F<<12))));
1968
1965
 
1969
-	/* TODO: Disable interrupt and so on... */
1970
-	if (hw->irq >= 0)
1971
-		synchronize_irq(hw->irq);
1972
1966
 	return 0;
1973
1967
 }
1974
1968