staging: sm750: move assignment out of if cond
authorMichel von Czettritz <michel.von.czettritz@gmail.com>
Thu, 26 Mar 2015 22:27:25 +0000 (23:27 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Apr 2015 11:39:33 +0000 (13:39 +0200)
This patch moves the assignments from the if conditions to the line before the condition.
The 3 occurrence are return values and the checks for errors.

Signed-off-by: Michel von Czettritz <michel.von.czettritz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/sm750fb/sm750.c

index f300df4f8e87de9c96c1ab75ab2f7bd57f40e8c6..3c7ea95dd9f93aa0f1619c246d3fea78d0eea155 100644 (file)
@@ -477,7 +477,8 @@ static int lynxfb_resume(struct pci_dev *pdev)
 
        console_lock();
 
-       if ((ret = pci_set_power_state(pdev, PCI_D0)) != 0) {
+       ret = pci_set_power_state(pdev, PCI_D0);
+       if (ret) {
                pr_err("error:%d occured in pci_set_power_state\n", ret);
                return ret;
        }
@@ -485,7 +486,8 @@ static int lynxfb_resume(struct pci_dev *pdev)
 
        if (pdev->dev.power.power_state.event != PM_EVENT_FREEZE) {
                pci_restore_state(pdev);
-               if ((ret = pci_enable_device(pdev)) != 0) {
+               ret = pci_enable_device(pdev);
+               if (ret) {
                        pr_err("error:%d occured in pci_enable_device\n", ret);
                        return ret;
                }
@@ -975,7 +977,8 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
                 info->cmap.red, info->cmap.green, info->cmap.blue,
                 info->cmap.transp);
 
-       if ((ret = fb_alloc_cmap(&info->cmap, 256, 0)) < 0) {
+       ret = fb_alloc_cmap(&info->cmap, 256, 0);
+       if (ret < 0) {
                pr_err("Could not allcate memory for cmap.\n");
                goto exit;
        }
This page took 0.042562 seconds and 5 git commands to generate.