]> git.itanic.dy.fi Git - linux-stable/commitdiff
atm: iphase: Do PCI error checks on own line
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 11 Sep 2023 12:53:51 +0000 (15:53 +0300)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 10 Oct 2023 21:40:13 +0000 (16:40 -0500)
In get_esi() PCI errors are checked inside line-split "if" conditions (in
addition to the file not following the coding style). To make the code in
get_esi() more readable, fix the coding style and use the usual error
handling pattern with a separate variable.

In addition, initialization of 'error' variable at declaration is not
needed.

No functional changes intended.

Link: https://lore.kernel.org/r/20230911125354.25501-4-ilpo.jarvinen@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/atm/iphase.c

index 32414868695305712567169ef4db5546d963e16e..9bba8f280a4d4c9801c6c4e4d6c701f1b020712b 100644 (file)
@@ -2291,19 +2291,21 @@ static int get_esi(struct atm_dev *dev)
 static int reset_sar(struct atm_dev *dev)  
 {  
        IADEV *iadev;  
-       int i, error = 1;  
+       int i, error;
        unsigned int pci[64];  
          
        iadev = INPH_IA_DEV(dev);  
-       for(i=0; i<64; i++)  
-         if ((error = pci_read_config_dword(iadev->pci,  
-                               i*4, &pci[i])) != PCIBIOS_SUCCESSFUL)  
-             return error;  
+       for (i = 0; i < 64; i++) {
+               error = pci_read_config_dword(iadev->pci, i * 4, &pci[i]);
+               if (error != PCIBIOS_SUCCESSFUL)
+                       return error;
+       }
        writel(0, iadev->reg+IPHASE5575_EXT_RESET);  
-       for(i=0; i<64; i++)  
-         if ((error = pci_write_config_dword(iadev->pci,  
-                                       i*4, pci[i])) != PCIBIOS_SUCCESSFUL)  
-           return error;  
+       for (i = 0; i < 64; i++) {
+               error = pci_write_config_dword(iadev->pci, i * 4, pci[i]);
+               if (error != PCIBIOS_SUCCESSFUL)
+                       return error;
+       }
        udelay(5);  
        return 0;  
 }