Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp746050pxb; Tue, 5 Apr 2022 21:29:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWoSgC33UsosQIId2g8I0XoI8wUvVqK2mpgn8QLUnqawwBqe5+5QZ+Pvg1xWNrVloi9cA3 X-Received: by 2002:a17:902:bd89:b0:156:8467:782b with SMTP id q9-20020a170902bd8900b001568467782bmr6847094pls.12.1649219396611; Tue, 05 Apr 2022 21:29:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649219396; cv=none; d=google.com; s=arc-20160816; b=ICuMogT9qU6PmtpULSgQwFzLX2saGWpXzCoweubA1eewjHko+LqEWNsub/KfR6RJR1 1cCTzU7Oxizxdq2Zp9EZqIhN4QkCaDHIgxCxv4PbX33wKVNC5Zkf/S1mrSJLzGku51ya W25NEhyBY6DiEDaI/LwklZjs57Ii2K6S1BGX5bn5nWanRuf8ZqfHXpFViKCD+UNiAlLz ddYdQVANFDbsYAWeTbDSs6LqHuNb/tNqdzKkUFpvk/AV6t5+rNlr7RUEYnhu0A2HrV69 WyVxURmh0YAAvawi+IVIvoClsQGsUhSqTzjMHmLObrJXtH93y4dteElKHY4DEg/zuTT6 KH/w== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mhzPrLUUB68n3WLW24RM8m8bq53s6hsZiyk4dUoEG3U=; b=qYNn7UzfoRt4q2Fj6Q0S8b4RuMQEgWOvpuNiELe/AOV/KhW235wRJlgRRpoZB+6A9b IOD5koJciLsv+/7nQpN1fIKpL3MofSBOfgRc7ZtR9YhxirSMg2wt/X8JJJmRZNWVagPL 6LPfWavIVncr38EAHxvFAI6whrtRE9aE22mCI7krX3eNs0kj7+zIfoqm2pEgoL0dz7hK spg1qyX3ap/fJ3+qB+hIcUpvDRgHqofpvaSdc26dKEJpUChnMHnBzqu0i6H4vzzp72yh aoyB9/85RhMZbqVYIOTTdt/hF5J8Kcvy4HtNzEAPBSefD1q3/x7KSxBT8eDqLhU8XodT mLcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1hyV24Xr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id co14-20020a17090afe8e00b001bd14e030b6si3662034pjb.142.2022.04.05.21.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 21:29:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1hyV24Xr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 82DD1170DB4; Tue, 5 Apr 2022 19:52:30 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1388074AbiDEPUM (ORCPT + 99 others); Tue, 5 Apr 2022 11:20:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346935AbiDEJpp (ORCPT ); Tue, 5 Apr 2022 05:45:45 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D794235DE8; Tue, 5 Apr 2022 02:32:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 746D0B81C6E; Tue, 5 Apr 2022 09:32:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDFBAC385B3; Tue, 5 Apr 2022 09:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649151126; bh=arK/Jdx6Jya54jloe0rN7JBuzPaeDIP9HfZ2GK9PVNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1hyV24Xrr2lIrPgUrEjtXnWvRAaP/ecRJgGSG8br5fvp5pKWa6Upsc6OGElSrtDca 3LXLjlo81vZpiR43AF9eMaH76w+Bv8unyoNFPu1QPISRFaX3XciGW89ncNWAj5V8+J Q3sQLQj1JWGg2gomGec/UI2PBiOjaXypYzizWpWg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Nishanth Menon , Sasha Levin Subject: [PATCH 5.15 304/913] firmware: ti_sci: Fix compilation failure when CONFIG_TI_SCI_PROTOCOL is not defined Date: Tue, 5 Apr 2022 09:22:46 +0200 Message-Id: <20220405070348.969205213@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070339.801210740@linuxfoundation.org> References: <20220405070339.801210740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 From: Christophe JAILLET [ Upstream commit 043cfff99a18933fda2fb2e163daee73cc07910b ] Remove an extra ";" which breaks compilation. Fixes: 53bf2b0e4e4c ("firmware: ti_sci: Add support for getting resource with subtype") Signed-off-by: Christophe JAILLET Signed-off-by: Nishanth Menon Link: https://lore.kernel.org/r/e6c3cb793e1a6a2a0ae2528d5a5650dfe6a4b6ff.1640276505.git.christophe.jaillet@wanadoo.fr Signed-off-by: Sasha Levin --- include/linux/soc/ti/ti_sci_protocol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h index 0aad7009b50e..bd0d11af76c5 100644 --- a/include/linux/soc/ti/ti_sci_protocol.h +++ b/include/linux/soc/ti/ti_sci_protocol.h @@ -645,7 +645,7 @@ devm_ti_sci_get_of_resource(const struct ti_sci_handle *handle, static inline struct ti_sci_resource * devm_ti_sci_get_resource(const struct ti_sci_handle *handle, struct device *dev, - u32 dev_id, u32 sub_type); + u32 dev_id, u32 sub_type) { return ERR_PTR(-EINVAL); } -- 2.34.1