From patchwork Mon Jan 19 15:54:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 5659191 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CA9749F357 for ; Mon, 19 Jan 2015 15:56:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0CE3B2038F for ; Mon, 19 Jan 2015 15:56:35 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id D0C072037D for ; Mon, 19 Jan 2015 15:56:33 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id E9A54261ACE; Mon, 19 Jan 2015 16:56:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id BE2EC2614C8; Mon, 19 Jan 2015 16:55:14 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 568762614C5; Mon, 19 Jan 2015 16:55:13 +0100 (CET) Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 0DC852610A1 for ; Mon, 19 Jan 2015 16:55:03 +0100 (CET) Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A7DB2ACD4; Mon, 19 Jan 2015 15:55:02 +0000 (UTC) From: Takashi Iwai To: alsa-devel@alsa-project.org Date: Mon, 19 Jan 2015 16:54:47 +0100 Message-Id: <1421682891-11594-14-git-send-email-tiwai@suse.de> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1421682891-11594-1-git-send-email-tiwai@suse.de> References: <1421682891-11594-1-git-send-email-tiwai@suse.de> Cc: Stefan Hajnoczi , Chris Rorvick Subject: [alsa-devel] [PATCH 13/17] ALSA: line6: Remove CHECK_RETURN macro X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Such a macro doesn't improve readability. Signed-off-by: Takashi Iwai --- sound/usb/line6/driver.h | 7 ------- sound/usb/line6/pod.c | 12 +++++++++--- sound/usb/line6/toneport.c | 10 ++++++---- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h index 8e4d946a130c..f484aa09840b 100644 --- a/sound/usb/line6/driver.h +++ b/sound/usb/line6/driver.h @@ -48,13 +48,6 @@ #define LINE6_CHANNEL_MASK 0x0f -#define CHECK_RETURN(x) \ -do { \ - err = x; \ - if (err < 0) \ - return err; \ -} while (0) - #define CHECK_STARTUP_PROGRESS(x, n) \ do { \ if ((x) >= (n)) \ diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c index 6b30deb6b157..6f4b09982589 100644 --- a/sound/usb/line6/pod.c +++ b/sound/usb/line6/pod.c @@ -429,9 +429,15 @@ static int pod_create_files2(struct device *dev) { int err; - CHECK_RETURN(device_create_file(dev, &dev_attr_device_id)); - CHECK_RETURN(device_create_file(dev, &dev_attr_firmware_version)); - CHECK_RETURN(device_create_file(dev, &dev_attr_serial_number)); + err = device_create_file(dev, &dev_attr_device_id); + if (err < 0) + return err; + err = device_create_file(dev, &dev_attr_firmware_version); + if (err < 0) + return err; + err = device_create_file(dev, &dev_attr_serial_number); + if (err < 0) + return err; return 0; } diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c index 3097a75a9bec..24544b7ab476 100644 --- a/sound/usb/line6/toneport.c +++ b/sound/usb/line6/toneport.c @@ -431,10 +431,12 @@ static int toneport_init(struct usb_interface *interface, line6_read_data(line6, 0x80c2, &toneport->firmware_version, 1); if (toneport_has_led(toneport->type)) { - CHECK_RETURN(device_create_file - (&interface->dev, &dev_attr_led_red)); - CHECK_RETURN(device_create_file - (&interface->dev, &dev_attr_led_green)); + err = device_create_file(&interface->dev, &dev_attr_led_red); + if (err < 0) + return err; + err = device_create_file(&interface->dev, &dev_attr_led_green); + if (err < 0) + return err; } toneport_setup(toneport);