From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21BE7C433B4 for ; Mon, 3 May 2021 18:56:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DFBD9611AD for ; Mon, 3 May 2021 18:56:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229641AbhECS5f (ORCPT ); Mon, 3 May 2021 14:57:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:49566 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229628AbhECS5e (ORCPT ); Mon, 3 May 2021 14:57:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D5CBC611C0; Mon, 3 May 2021 18:56:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620068201; bh=z/7gw+6ZRLXsuBnPOx43bmGTgE7IjCZTwYT4ifHiBRU=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=XMnFZUGh83wJO1+naG1Nf0e/EYLcxFyXO1zaYUgXgq/5X+iRcL1seqtOVB43xLa3r FTAvVz8XkYEGfZpkIFXhBR2qZkTd3pvvTRFYemFbt7jr5lh/0KHmJzDmtQlLLBAfZQ m3AZwuu5R1r41ZvpcUyPZSzLQI2d3s56vM1jB/8ltMkfrnqJBu4DQ0/fOXslUf+LLS atY5Coe0mzABQfvZAh/MctmOOkoQoaZnTfsdrrTu27me+XIyzkSr6eYIcV4inUspf0 ufaXs6Mn+Xrb2EdD9PaQmUE5rtdjLSgYHPKxY8jy5136LdKCM0oeXxA2wKUdZpwqoB LhyxVT+KQvJRQ== Date: Mon, 3 May 2021 13:56:39 -0500 From: Bjorn Helgaas To: Jim Quinlan , Philipp Zabel Cc: Amjad Ouled-Ameur , linux-pci@vger.kernel.org, Nicolas Saenz Julienne , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com, stable@vger.kernel.org, open list Subject: Re: [PATCH v6 1/3] reset: add missing empty function reset_control_rearm() Message-ID: <20210503185639.GA993318@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210430152156.21162-2-jim2101024@gmail.com> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Fri, Apr 30, 2021 at 11:21:54AM -0400, Jim Quinlan wrote: > All other functions are defined for when CONFIG_RESET_CONTROLLER > is not set. > > Fixes: 557acb3d2cd9 ("reset: make shared pulsed reset controls re-triggerable") > CC: stable@vger.kernel.org # v5.11+ > Signed-off-by: Jim Quinlan Philipp, I'd like to merge this via the PCI tree since the brcmstb patch depends on it. It looks correct to me, but I'd really like to have your ack before merging it. > --- > include/linux/reset.h | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/include/linux/reset.h b/include/linux/reset.h > index b9109efa2a5c..9700124affa3 100644 > --- a/include/linux/reset.h > +++ b/include/linux/reset.h > @@ -47,6 +47,11 @@ static inline int reset_control_reset(struct reset_control *rstc) > return 0; > } > > +static inline int reset_control_rearm(struct reset_control *rstc) > +{ > + return 0; > +} > + > static inline int reset_control_assert(struct reset_control *rstc) > { > return 0; > -- > 2.17.1 >