From patchwork Mon Jul 20 01:32:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 6824891 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7AF15C05AC for ; Mon, 20 Jul 2015 01:33:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5DB4D2047D for ; Mon, 20 Jul 2015 01:33:02 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id A07E220640 for ; Mon, 20 Jul 2015 01:32:50 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id A6A79260670; Mon, 20 Jul 2015 03:32:48 +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_SIGNED, RCVD_IN_DNSWL_NONE, 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 266E926064C; Mon, 20 Jul 2015 03:32:41 +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 AE8B3260651; Mon, 20 Jul 2015 03:32:38 +0200 (CEST) Received: from mail-pd0-f170.google.com (mail-pd0-f170.google.com [209.85.192.170]) by alsa0.perex.cz (Postfix) with ESMTP id 524CD260633 for ; Mon, 20 Jul 2015 03:32:33 +0200 (CEST) Received: by pdbbh15 with SMTP id bh15so48569197pdb.1 for ; Sun, 19 Jul 2015 18:32:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=uMC9m/e6D2dJyT/Qzh/+5gUYUqL6fpbdUdCOIoi0vwE=; b=j5HDnDXTIi45z2NRLkpR6VzdqiTLQGQ4qrYVwvLxLUfi+WKixfF7uE4nhU2uYmXCEu qAr7Yl41/dpYfBYZE66AidI3/UXFCN+45RljSRLIfbBReK+68lYa3fVEqgP97q3Iuioa 0mhUc5UD7E75eNZtWiSF6hZZYPDfQZqDHihGs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uMC9m/e6D2dJyT/Qzh/+5gUYUqL6fpbdUdCOIoi0vwE=; b=YNha79xWr9XqzXukgg/4e2J70pqrZFjMyuOhSwm/xyy470Klw55/jp21EY61r6oQeA 4fmkg9Yw0dwtp2PDhTmD18zjBM+voGqxBV5Fkl6qJ5wUCjaciM+m1EfD5V5306z6YcIF UBhoxv5V9x6AxlAVtVjoQqdqUCnIMLvzNmBtfDyrsF1+3a2hY7MIjNQHFuZ10feEDqex eU09ePE5oRmYqnhOzFNu6Qe+duMmE3er55NZoSBDP45T/8a7rzrJlJ3P2eJYEfpWgDsb uQtXzFIXtzwEPFVCpPyL3yC7UtvTFloAVdx3/0zmIeixFlQkhvQwXLg7Ex4Habh3Ow2y HjMA== X-Gm-Message-State: ALoCoQmgLEBk/OKQ4gc06WhY+i0K2XokIhsdq6lLTutDj+lJLj2YROwIrxqME4zMVvcD4yGc3Kgt X-Received: by 10.66.66.40 with SMTP id c8mr9335135pat.117.1437355951293; Sun, 19 Jul 2015 18:32:31 -0700 (PDT) Received: from drinkcat.tpe.corp.google.com ([172.30.210.53]) by smtp.gmail.com with ESMTPSA id b3sm18395412pdg.67.2015.07.19.18.32.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Jul 2015 18:32:30 -0700 (PDT) From: Nicolas Boichat To: Mark Brown Date: Mon, 20 Jul 2015 09:32:05 +0800 Message-Id: <1437355925-20498-1-git-send-email-drinkcat@chromium.org> X-Mailer: git-send-email 2.4.3.573.g4eafbef Cc: Oder Chiou , alsa-devel@alsa-project.org, Takashi Iwai , Liam Girdwood , Bard Liao Subject: [alsa-devel] [PATCH] ASoC: rt5645: Remove return value in jack detect work 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 "ASoC: rt5645: Check if codec is initialized in workqueue handler" adds a check if codec is NULL in rt5645_irq_detection, which returns an int. However, "ASoC: rt5645: Remove irq_jack_detection function" removes that function, and moves the code in jack_detect_work, which returns void. Remove the return value to fix compilation warning. Signed-off-by: Nicolas Boichat --- Mark, Thanks for replacing "ASoC: rt5645: Check if codec is initialized in workqueue handler" in fix/rt5645, that makes this a bit easier. This patch applies on top of broonie/sound.git/for-next, and should be applied in topic/rt5645, after merging fix/rt5645 into topic/rt5645. sound/soc/codecs/rt5645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 3a6756d..9d54b34 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2928,7 +2928,7 @@ static void rt5645_jack_detect_work(struct work_struct *work) int val, btn_type, gpio_state = 0, report = 0; if (!rt5645->codec) - return -EINVAL; + return; switch (rt5645->pdata.jd_mode) { case 0: /* Not using rt5645 JD */