From patchwork Thu May 18 07:27:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 95681 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp302678vqo; Thu, 18 May 2023 00:29:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Ved5HziiHS6hn88zpTOrcAgJjoNb5chSrsdD1u4eL8GvCEEx9w5CixdLFLj8qLWiKXzqT X-Received: by 2002:a17:90a:ee94:b0:247:6022:9595 with SMTP id i20-20020a17090aee9400b0024760229595mr1457705pjz.45.1684394989581; Thu, 18 May 2023 00:29:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684394989; cv=none; d=google.com; s=arc-20160816; b=Y8VBQp0dq8gpTgaZz1CSbu+NlAQMvuZ1OBfwbXITGWz2NjDkeqvqsfOp73ekUlVvSo PLd0YWd1vSo5bTlwaB+Ya9RUgALb2SDiPlbWpmwRfzrHgKkcprJjSGw7fWVHH7b2uEfw DPMGKPE8QyONi+c6cpskhI6vjMsh6+utcjykScGS2An6RHv7X1UI0nJ7Es7wg72SMUAO RsX9YHoNllw44RBxsewf/K3H9qVhzNMUZk/ZISo5Fp8PpjNQJ9ALxowg8EF5BeWBiExn B57m9VS7CgLShws1w9alr/Hd3KO56v/QVTERRZ590zfg8dLZ+4x5Apl51hI5wbGq4hjS TDDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=w7CXEP7TWtcrBNlAfURzS7ZFy4jvErEzkp1RHuGj8Jo=; b=x2OBQ77xdYTA/M5LYPEMNT8bAAGudXoq1qVfuJVa8BuspRuhBDt7jwpBAG1nGaEoGp 6iBinv7eLQ0tMb3T7FjKF10y0fkg8fmhIcBS2NC1L7PqWzmdCqRSmLGU46YbPAOq2qPY gv+UbTgQlq6auY0ryohZf/1aCv2YnEgyX6gpqCinDvAFEjFn80Q97WXGOsVkV3JxZP99 OLfdmzjXrf+hGGC0ngJSxOCRu9TjK8EdmqywEDqnUKMvKtzQ8IpwccG5SOW9ayii1mbh rj/8cYO9ASBgsEZPniaGVp3yH3+64X/GgsfKzZhpXiiuVkLb8hBqtQPoCVSBavuiCJ62 mw6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zNNOgZ+A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s1-20020a17090a440100b0024df7c1b9e7si3441622pjg.151.2023.05.18.00.29.35; Thu, 18 May 2023 00:29:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zNNOgZ+A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230141AbjERH2U (ORCPT + 99 others); Thu, 18 May 2023 03:28:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230103AbjERH2E (ORCPT ); Thu, 18 May 2023 03:28:04 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33B8C2101 for ; Thu, 18 May 2023 00:28:03 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-510eb3dbaaeso285832a12.1 for ; Thu, 18 May 2023 00:28:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684394881; x=1686986881; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w7CXEP7TWtcrBNlAfURzS7ZFy4jvErEzkp1RHuGj8Jo=; b=zNNOgZ+A7E64Nl/R3Y706ivhMQUe0MZ6cSd3utBHP+wuuEm+nHd0T7bOehTUAg4M6Z 1s/Wd/s+mlBNQv+MZwjIwsSdULFtvLqfHzEbPZ84qOA4mQmjwr0vEJSBLjLgoBtxRXUw QZ0JpYoizjZeN3450GpOd+ZtxLEaQRM1aUPFDIkw49zFz9c16FMD9TB+SJO5lepqBbUF BI7rFyrPYi7BudVocZzJuDletVdEKHlxPrY2qj4XCsbPTLeDrUe9gfEFCtpvtNZikuJh DJd+0Iuj4CSQwRnUgnzKJ5I2K2zu46WEt6Eq0/3x+EagoXEp/DUZlnsvpKWzPUk9ATn9 Ll3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684394881; x=1686986881; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w7CXEP7TWtcrBNlAfURzS7ZFy4jvErEzkp1RHuGj8Jo=; b=d6B3rT2qZgQ7kN73nDzs2lmHWf8yjiCt/ibnsEQdrcwrm1J2m559nt/62GiPBY3xm4 +B8eK13VjO0FjBl9oK1N3O+oEp2jbTwkZSMJC7s8hi6iLf6GJxtogmVOogY+Xa6s70Uj xl5V8Cg7IIyE/XDo3YlJm+qmP+ti8QZCV9DFwJgRGac19BxkePVkofrxYGMOhMp0lGgB opOWmGkVPDAwLgi/vomAGttKOxhjXkRHOM5njWMEXSvuHJlodWHRqkC1gQ7W5JmXd1YP ah3fSuUDiP2QEKvn4pfPhcVJWSv1ToTEN135fjuQPnRXlDi7zkBqrIyWuzTO+WZ1jn7F BnwQ== X-Gm-Message-State: AC+VfDwMaGR6FiBpA3j/uCKv6hsV4PdGzm/4Jv3IX14B9wtWlMJtyaqm FeDFosFNQAV8q8kK2X2aOoZk9Q== X-Received: by 2002:a17:906:6a1f:b0:968:a237:f955 with SMTP id qw31-20020a1709066a1f00b00968a237f955mr33784630ejc.64.1684394881605; Thu, 18 May 2023 00:28:01 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:a2b:c408:5834:f48e]) by smtp.gmail.com with ESMTPSA id g17-20020a17090669d100b00965aee5be9asm594241ejs.170.2023.05.18.00.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 00:28:01 -0700 (PDT) From: Krzysztof Kozlowski To: Oder Chiou , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Pierre-Louis Bossart Subject: [RESEND PATCH 04/12] ASoC: codecs: rt5682: do not store status in state container Date: Thu, 18 May 2023 09:27:45 +0200 Message-Id: <20230518072753.7361-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518072753.7361-1-krzysztof.kozlowski@linaro.org> References: <20230518072753.7361-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766216160305991129?= X-GMAIL-MSGID: =?utf-8?q?1766216160305991129?= Driver in its update status callback stores Soundwire device status in state container but it never uses it later. Simplify the code a bit. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Pierre-Louis Bossart --- sound/soc/codecs/rt5682-sdw.c | 5 +---- sound/soc/codecs/rt5682.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c index 6e3b5c5eced1..67404f45389f 100644 --- a/sound/soc/codecs/rt5682-sdw.c +++ b/sound/soc/codecs/rt5682-sdw.c @@ -500,9 +500,6 @@ static int rt5682_update_status(struct sdw_slave *slave, { struct rt5682_priv *rt5682 = dev_get_drvdata(&slave->dev); - /* Update the status */ - rt5682->status = status; - if (status == SDW_SLAVE_UNATTACHED) rt5682->hw_init = false; @@ -510,7 +507,7 @@ static int rt5682_update_status(struct sdw_slave *slave, * Perform initialization only if slave status is present and * hw_init flag is false */ - if (rt5682->hw_init || rt5682->status != SDW_SLAVE_ATTACHED) + if (rt5682->hw_init || status != SDW_SLAVE_ATTACHED) return 0; /* perform I/O transfers required for Slave initialization */ diff --git a/sound/soc/codecs/rt5682.h b/sound/soc/codecs/rt5682.h index d568c6993c33..301d1817f8f1 100644 --- a/sound/soc/codecs/rt5682.h +++ b/sound/soc/codecs/rt5682.h @@ -1440,7 +1440,6 @@ struct rt5682_priv { bool disable_irq; struct mutex calibrate_mutex; struct sdw_slave *slave; - enum sdw_slave_status status; struct sdw_bus_params params; bool hw_init; bool first_hw_init;