fixup! PCI: brcmstb: Add control of subdevice voltage regulators
Subsystems (5)
Jim Quinlan
maintainerPATCH 1/1 fixup! PCI: brcmstb: Add control of subdevice voltage regulators
--- drivers/pci/controller/pcie-brcmstb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-brcmstb.c +2 -1
@@ -1392,7 +1392,8 @@ static int brcm_pcie_resume(struct device *dev) err_reset:reset_control_rearm (pcie->rescal); err_regulator: -regulator_bulk_disable (pcie->sr->num_supplies, pcie->sr->supplies); +if (pcie->sr) +regulator_bulk_disable (pcie->sr->num_supplies, pcie->sr->supplies); err_disable_clk:clk_disable_unprepare (pcie->clk);return ret;
Signature · 1 line
2.17.1
On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote:
What's this connected to? Is this a fix for a patch that has already been merged? If so, which one? If it's a standalone thing, it needs a commit log and a Signed-off-by. Actually, that would be good in any case. Maybe a lore link to the relevant patch?
Quoted 21 lines
--- drivers/pci/controller/pcie-brcmstb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/pci/controller/pcie-brcmstb.c +2
-1@@ -1392,7 +1392,8 @@ static int brcm_pcie_resume(struct device *dev) err_reset:reset_control_rearm (pcie->rescal); err_regulator: -regulator_bulk_disable (pcie->sr->num_supplies, pcie->sr->supplies); +if (pcie->sr) +regulator_bulk_disable (pcie->sr->num_supplies, pcie->sr->supplies); err_disable_clk:clk_disable_unprepare (pcie->clk);return ret;Signature · 1 line
2.17.1
Quoted 6 lines · Bjorn Helgaas
On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote:
What's this connected to? Is this a fix for a patch that has already been merged? If so, which one? If it's a standalone thing, it needs a commit log and a Signed-off-by. Actually, that would be good in any case. Maybe a lore link to the relevant patch?
I was about to reply. It is a fixup for one of the branches I am queueing for v5.17 (pci/brcmstb), I can either squash that it myself or you can do it, provided that Jim gives us the commit id this is actually fixing (or a lore link to the patch posting so that we can infer the commit to fix).
Lorenzo
Quoted 21 lines
Quoted 21 lines
--- drivers/pci/controller/pcie-brcmstb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/pci/controller/pcie-brcmstb.c +2
-1@@ -1392,7 +1392,8 @@ static int brcm_pcie_resume(struct device *dev) err_reset:reset_control_rearm (pcie->rescal); err_regulator: -regulator_bulk_disable (pcie->sr->num_supplies, pcie->sr->supplies); +if (pcie->sr) +regulator_bulk_disable (pcie->sr->num_supplies, pcie->sr->supplies); err_disable_clk:clk_disable_unprepare (pcie->clk);return ret;Signature · 1 line
2.17.1
Quoted 9 lines · Lorenzo Pieralisi
Quoted 6 lines · Bjorn Helgaas
On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote:
What's this connected to? Is this a fix for a patch that has already been merged? If so, which one? If it's a standalone thing, it needs a commit log and a Signed-off-by. Actually, that would be good in any case. Maybe a lore link to the relevant patch?
Quoted 5 lines
I was about to reply. It is a fixup for one of the branches I am queueing for v5.17 (pci/brcmstb), I can either squash that it myself or you can do it, provided that Jim gives us the commit id this is actually fixing (or a lore link to the patch posting so that we can infer the commit to fix).
Hi,
Sorry, I am unfamiliar with the proper process of sending a fixup like this. The Lore URL is
https://lore.kernel.org/linux-pci/[email protected]/T/#m3da60632bd79330cfdfc99ae7bac4367200f5ae5
And the target commit for the fixup is 6/7
Regards,
Jim Quinlan
Broadcom STB
Quoted 24 lines
Lorenzo
Quoted 21 lines
Quoted 21 lines
--- drivers/pci/controller/pcie-brcmstb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/pci/controller/pcie-brcmstb.c +2
-2@@ -1392,7 +1392,8 @@ static int brcm_pcie_resume(struct device *dev) err_reset:reset_control_rearm (pcie->rescal); err_regulator: -regulator_bulk_disable (pcie->sr->num_supplies, pcie->sr->supplies); +if (pcie->sr) +regulator_bulk_disable (pcie->sr->num_supplies, pcie->sr->supplies); err_disable_clk:clk_disable_unprepare (pcie->clk);return ret; --2.17.1
Quoted 3 lines · Jim Quinlan
--- drivers/pci/controller/pcie-brcmstb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Thanks, to expedite this since we're in the merge window, I cloned Lorenzo's branch and squashed this into pci/host/brcmstb for v5.17.
Quoted 17 lines
drivers/pci/controller/pcie-brcmstb.c +2
-1@@ -1392,7 +1392,8 @@ static int brcm_pcie_resume(struct device *dev) err_reset:reset_control_rearm (pcie->rescal); err_regulator: -regulator_bulk_disable (pcie->sr->num_supplies, pcie->sr->supplies); +if (pcie->sr) +regulator_bulk_disable (pcie->sr->num_supplies, pcie->sr->supplies); err_disable_clk:clk_disable_unprepare (pcie->clk);return ret;Signature · 1 line
2.17.1
Quoted 7 lines · Lorenzo Pieralisi
Quoted 5 lines · Bjorn Helgaas
On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote:
What's this connected to? Is this a fix for a patch that has already been merged? If so, which one? If it's a standalone thing, it needs a commit log and a Signed-off-by. Actually, that would be good in any case. Maybe a lore link to the relevant patch?
Quoted 5 lines
I was about to reply. It is a fixup for one of the branches I am queueing for v5.17 (pci/brcmstb), I can either squash that it myself or you can do it, provided that Jim gives us the commit id this is actually fixing (or a lore link to the patch posting so that we can infer the commit to fix).
If you apply the patch to the pci/host/brcmstb branch with "git am" as usual, then execute "git rebase --autosquash v5.16-rc1", git will automatically figure out the commit id this patch is fixing, fold it into the commit and rebase the remainder of the branch on top of it.
Thanks,
Lukas
Quoted 14 lines · Lukas Wunner
Quoted 7 lines · Lorenzo Pieralisi
Quoted 5 lines · Bjorn Helgaas
On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote:
What's this connected to? Is this a fix for a patch that has already been merged? If so, which one? If it's a standalone thing, it needs a commit log and a Signed-off-by. Actually, that would be good in any case. Maybe a lore link to the relevant patch?Quoted 5 lines
I was about to reply. It is a fixup for one of the branches I am queueing for v5.17 (pci/brcmstb), I can either squash that it myself or you can do it, provided that Jim gives us the commit id this is actually fixing (or a lore link to the patch posting so that we can infer the commit to fix).
Quoted 5 lines
If you apply the patch to the pci/host/brcmstb branch with "git am" as usual, then execute "git rebase --autosquash v5.16-rc1", git will automatically figure out the commit id this patch is fixing, fold it into the commit and rebase the remainder of the branch on top of it.
Wow! That's ... amazing. Or something :)
I already did it the old-fashioned way, but I'll try to remember this trick for next time.