On Mon, Sep 21, 2020 at 09:11:10PM +0800, Qinglang Miao wrote:

Simplify the return expression.

Signed-off-by: Qinglang Miao miaoqinglang@huawei.com

Pushed to drm-misc-next, thanks for your patch. -Daniel

---

drivers/gpu/vga/vga_switcheroo.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index 087304b1a..1401fd52f 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -1034,17 +1034,12 @@ static int vga_switcheroo_runtime_suspend(struct device *dev) static int vga_switcheroo_runtime_resume(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev);

• int ret;

  mutex_lock(&vgasr_mutex); vga_switcheroo_power_switch(pdev, VGA_SWITCHEROO_ON); mutex_unlock(&vgasr_mutex); pci_wakeup_bus(pdev->bus);

• ret = dev->bus->pm->runtime_resume(dev);

• if (ret)

• return ret;
  

• return 0;

• return dev->bus->pm->runtime_resume(dev);

}

/**

2.23.0