Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 3 May 2021 13:56:39 -0500
From:   Bjorn Helgaas <helgaas@kernel.org>
To:     Jim Quinlan <jim2101024@gmail.com>,
        Philipp Zabel <p.zabel@pengutronix.de>
Cc:     Amjad Ouled-Ameur <aouledameur@baylibre.com>,
        linux-pci@vger.kernel.org,
        Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
        bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com,
        stable@vger.kernel.org, open list <linux-kernel@vger.kernel.org>
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

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 <jim2101024@gmail.com>

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
>