Message ID | 20220104112024.601765-1-chi.minghao@zte.com.cn (mailing list archive) |
---|---|
State | Accepted |
Commit | 6bcfdc49f38e274e3016c45284bfb286aa5a35d6 |
Headers | show |
Series | mips/pci: remove redundant ret variable | expand |
On Tue, Jan 04, 2022 at 11:20:24AM +0000, cgel.zte@gmail.com wrote: > From: Minghao Chi <chi.minghao@zte.com.cn> > > Return value from rt3883_pci_r32() directly instead > of taking this in another redundant variable. > > Reported-by: Zeal Robot <zealci@zte.com.cn> > Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn> > Signed-off-by: CGEL ZTE <cgel.zte@gmail.com> > --- > arch/mips/pci/pci-rt3883.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c > index d3c947fa2969..e07ae098bdd8 100644 > --- a/arch/mips/pci/pci-rt3883.c > +++ b/arch/mips/pci/pci-rt3883.c > @@ -102,14 +102,12 @@ static u32 rt3883_pci_read_cfg32(struct rt3883_pci_controller *rpc, > unsigned func, unsigned reg) > { > u32 address; > - u32 ret; > > address = rt3883_pci_get_cfgaddr(bus, slot, func, reg); > > rt3883_pci_w32(rpc, address, RT3883_PCI_REG_CFGADDR); > - ret = rt3883_pci_r32(rpc, RT3883_PCI_REG_CFGDATA); > > - return ret; > + return rt3883_pci_r32(rpc, RT3883_PCI_REG_CFGDATA); > } > > static void rt3883_pci_write_cfg32(struct rt3883_pci_controller *rpc, > -- > 2.25.1 applied to mips-next. Thomas.
diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c index d3c947fa2969..e07ae098bdd8 100644 --- a/arch/mips/pci/pci-rt3883.c +++ b/arch/mips/pci/pci-rt3883.c @@ -102,14 +102,12 @@ static u32 rt3883_pci_read_cfg32(struct rt3883_pci_controller *rpc, unsigned func, unsigned reg) { u32 address; - u32 ret; address = rt3883_pci_get_cfgaddr(bus, slot, func, reg); rt3883_pci_w32(rpc, address, RT3883_PCI_REG_CFGADDR); - ret = rt3883_pci_r32(rpc, RT3883_PCI_REG_CFGDATA); - return ret; + return rt3883_pci_r32(rpc, RT3883_PCI_REG_CFGDATA); } static void rt3883_pci_write_cfg32(struct rt3883_pci_controller *rpc,