[PATCH] sound: don't use the deprecated function check_region

From: stufever
Date: Mon Aug 08 2011 - 04:01:52 EST


From: Wang Shaoyan <wangshaoyan.pt@xxxxxxxxxx>

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@xxxxxxxxxx>
---
sound/oss/pss.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index 9b800ce..0fa26bd 100644
--- a/sound/oss/pss.c
+++ b/sound/oss/pss.c
@@ -673,9 +673,10 @@ static void configure_nonsound_components(void)

if (pss_cdrom_port == -1) { /* If cdrom port enablation wasn't requested */
printk(KERN_INFO "PSS: CDROM port not enabled.\n");
- } else if (check_region(pss_cdrom_port, 2)) {
+ } else if (!request_region(pss_cdrom_port, 2, "PSS CDROM")) {
printk(KERN_ERR "PSS: CDROM I/O port conflict.\n");
} else {
+ release_region(pss_cdrom_port, 2);
set_io_base(devc, CONF_CDROM, pss_cdrom_port);
printk(KERN_INFO "PSS: CDROM I/O port set to 0x%x.\n", pss_cdrom_port);
}
--
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/