Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8039290a91c5dc4414093c086987a5d7738fe2fd

Authored by Wang Shaoyan
Committed by Takashi Iwai
1 parent 94094c8aae
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

sound: pss - don't use the deprecated function check_region 

sound/oss/pss.c: In function 'configure_nonsound_components':
  sound/oss/pss.c:676: warning: 'check_region' is deprecated (declared at include/linux/ioport.h:201)

Signed-off-by: Wang Shaoyan <wangshaoyan.pt@taobao.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

... ... @@ -673,7 +673,8 @@
673 673  
674 674 if (pss_cdrom_port == -1) { /* If cdrom port enablation wasn't requested */
675 675 printk(KERN_INFO "PSS: CDROM port not enabled.\n");
676   - } else if (check_region(pss_cdrom_port, 2)) {
  676 + } else if (!request_region(pss_cdrom_port, 2, "PSS CDROM")) {
  677 + pss_cdrom_port = -1;
677 678 printk(KERN_ERR "PSS: CDROM I/O port conflict.\n");
678 679 } else {
679 680 set_io_base(devc, CONF_CDROM, pss_cdrom_port);
... ... @@ -1232,7 +1233,8 @@
1232 1233 if(pssmpu)
1233 1234 unload_pss_mpu(&cfg_mpu);
1234 1235 unload_pss(&cfg);
1235   - }
  1236 + } else if (pss_cdrom_port != -1)
  1237 + release_region(pss_cdrom_port, 2);
1236 1238  
1237 1239 if(!pss_keep_settings) /* Keep hardware settings if asked */
1238 1240 {