From patchwork Wed Apr 9 09:28:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 3953241 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3D1D7BFF02 for ; Wed, 9 Apr 2014 09:34:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 61F342045A for ; Wed, 9 Apr 2014 09:34:37 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 3430D20458 for ; Wed, 9 Apr 2014 09:34:36 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id B37BA2617A5; Wed, 9 Apr 2014 11:34:34 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 362E1261A60; Wed, 9 Apr 2014 11:33:09 +0200 (CEST) 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 F1491261A5E; Wed, 9 Apr 2014 11:33:07 +0200 (CEST) Received: from mail-bk0-f44.google.com (mail-bk0-f44.google.com [209.85.214.44]) by alsa0.perex.cz (Postfix) with ESMTP id C7658261ADB for ; Wed, 9 Apr 2014 11:29:21 +0200 (CEST) Received: by mail-bk0-f44.google.com with SMTP id mz13so2201721bkb.17 for ; Wed, 09 Apr 2014 02:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=AB8UcrmThIW/piwhrEukfH/M7ASSxeuN7r1xhfKJ6qQ=; b=ETmOSxgFMajII/PzsV57IBeEleI5R+8oS9X7kJbxtMJNI2/V63QudlVA7yvWB925EX RtcLZIaN8/wS46EtYtwogKLUfVG20AQPDHdvsTOi43vrvoUf0fptJywn3uXEV71TmV0r rzvsQQ5cCpMOdXtWav1LpkqdLrcyDZcaCyCw8CB/3jjDL9jBYtBYbTjv8/UHUpdHsKpi enxBzKWw5FfAY+xU0K+cZ/w0uBJOL7kXulRvVwEIp5ekOZTkcoFwBexT0wG2W3bwfium iS5sVWuZSiI2sQGOhLzHyMWlEpYdgWYUPpgQP8Qq94MhUcARaXPLNv90PMDmU6zDi93x 6RrQ== X-Received: by 10.204.180.67 with SMTP id bt3mr7961567bkb.16.1397035760291; Wed, 09 Apr 2014 02:29:20 -0700 (PDT) Received: from localhost (port-93174.pppoe.wtnet.de. [84.46.76.115]) by mx.google.com with ESMTPSA id xj2sm1483760bkb.15.2014.04.09.02.29.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Apr 2014 02:29:19 -0700 (PDT) From: Thierry Reding To: Takashi Iwai , Jaroslav Kysela Date: Wed, 9 Apr 2014 11:28:26 +0200 Message-Id: <1397035706-11079-1-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 1.9.1 Cc: alsa-devel@alsa-project.org Subject: [alsa-devel] [PATCH] ALSA: hda - Make full_reset boolean 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 From: Thierry Reding The full_reset argument to azx_init_chip() carries boolean rather than numerical information, so update the type to reflect that. Signed-off-by: Thierry Reding --- sound/pci/hda/hda_controller.c | 8 ++++---- sound/pci/hda/hda_intel.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 97993e17f46a..98d31d153703 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -1604,7 +1604,7 @@ static void azx_exit_link_reset(struct azx *chip) } /* reset codec link */ -static int azx_reset(struct azx *chip, int full_reset) +static int azx_reset(struct azx *chip, bool full_reset) { if (!full_reset) goto __skip; @@ -1701,7 +1701,7 @@ static void azx_int_clear(struct azx *chip) /* * reset and start the controller registers */ -void azx_init_chip(struct azx *chip, int full_reset) +void azx_init_chip(struct azx *chip, bool full_reset) { if (chip->initialized) return; @@ -1841,7 +1841,7 @@ static void azx_bus_reset(struct hda_bus *bus) bus->in_reset = 1; azx_stop_chip(chip); - azx_init_chip(chip, 1); + azx_init_chip(chip, true); #ifdef CONFIG_PM if (chip->initialized) { struct azx_pcm *p; @@ -1948,7 +1948,7 @@ int azx_codec_create(struct azx *chip, const char *model, * get back to the sanity state. */ azx_stop_chip(chip); - azx_init_chip(chip, 1); + azx_init_chip(chip, true); } } } diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 77ca894f8284..d6bca62ef387 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -636,7 +636,7 @@ static int azx_resume(struct device *dev) return -EIO; azx_init_pci(chip); - azx_init_chip(chip, 1); + azx_init_chip(chip, true); snd_hda_resume(chip->bus); snd_power_change_state(card, SNDRV_CTL_POWER_D0); @@ -689,7 +689,7 @@ static int azx_runtime_resume(struct device *dev) status = azx_readw(chip, STATESTS); azx_init_pci(chip); - azx_init_chip(chip, 1); + azx_init_chip(chip, true); bus = chip->bus; if (status && bus) {