Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33906b36 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman
Browse files

atm: iphase: Do PCI error checks on own line 

[ Upstream commit c28742447ca9879b52fbaf022ad844f0ffcd749c ]

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: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 54f4dde8

drivers/atm/iphase.c

+11 −9
Original line number Diff line number Diff line
@@ -2290,19 +2290,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)  

	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)  

	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;  

}