| Message ID | 20210430152156.21162-2-jim2101024@gmail.com |
|---|---|
| State | Accepted |
| Commit | 48582b2e3b87b794a9845d488af2c76ce055502b |
| Headers | show |
| Series | [v6,1/3] reset: add missing empty function reset_control_rearm() | expand |
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 >
On Mon, 2021-05-03 at 13:56 -0500, Bjorn Helgaas wrote: > 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. Acked-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp
On Mon, May 10, 2021 at 09:45:54AM +0200, Philipp Zabel wrote: > On Mon, 2021-05-03 at 13:56 -0500, Bjorn Helgaas wrote: > > 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. > > Acked-by: Philipp Zabel <p.zabel@pengutronix.de> Thanks a lot! I wanted to include this for v5.13, so I took the liberty of including it without your ack, so I'm glad you agree ;) Sorry for the late ack request. https://git.kernel.org/linus/48582b2e3b87
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;
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> --- include/linux/reset.h | 5 +++++ 1 file changed, 5 insertions(+)