From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751686Ab1HHIBs (ORCPT ); Mon, 8 Aug 2011 04:01:48 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:65425 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750899Ab1HHIBq (ORCPT ); Mon, 8 Aug 2011 04:01:46 -0400 From: stufever@gmail.com To: linux-kernel@vger.kernel.org Cc: tiwai@suse.de, perex@perex.cz, Wang Shaoyan Subject: [PATCH] sound: don't use the deprecated function check_region Date: Mon, 8 Aug 2011 16:07:12 +0800 Message-Id: <1312790832-6790-1-git-send-email-wangshaoyan.pt@taobao.com> X-Mailer: git-send-email 1.7.4.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wang Shaoyan 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 --- 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