evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PCI: portdrv: minor cleanup for pcie_port_device_register

Browse source 
Minor cleanups for pcie_port_device_register().

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Kenji Kaneshige 2009-11-25 21:05:35 +09:00 • committed by Jesse Barnes
parent fbb5de70bb
commit 40717c39b1
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/pci/pcie/portdrv_core.c
View file

@ -297,13 +297,15 @@ static int pcie_device_init(struct pci_dev *pdev, int service, int irq)
int pcie_port_device_register(struct pci_dev *dev) int pcie_port_device_register(struct pci_dev *dev)
{ {
struct pcie_port_data *port_data; struct pcie_port_data *port_data;
int status, capabilities, i, nr_serv; int status, capabilities, i, nr_service;
int irqs[PCIE_PORT_DEVICE_MAXSERVICES]; int irqs[PCIE_PORT_DEVICE_MAXSERVICES];
/* Get and check PCI Express port services */
capabilities = get_port_device_capability(dev); capabilities = get_port_device_capability(dev);
if (!capabilities) if (!capabilities)
return -ENODEV; return -ENODEV;
/* Allocate driver data for port device */
port_data = kzalloc(sizeof(*port_data), GFP_KERNEL); port_data = kzalloc(sizeof(*port_data), GFP_KERNEL);
if (!port_data) if (!port_data)
return -ENOMEM; return -ENOMEM;
@ -315,7 +317,6 @@ int pcie_port_device_register(struct pci_dev *dev)
if (status) if (status)
goto error_kfree; goto error_kfree;
pci_set_master(dev); pci_set_master(dev);
/* /*
* Initialize service irqs. Don't use service devices that * Initialize service irqs. Don't use service devices that
* require interrupts if there is no way to generate them. * require interrupts if there is no way to generate them.
@ -328,20 +329,18 @@ int pcie_port_device_register(struct pci_dev *dev)
} }
/* Allocate child services if any */ /* Allocate child services if any */
for (i = 0, nr_serv = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) { status = -ENODEV;
nr_service = 0;
for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) {
int service = 1 << i; int service = 1 << i;
if (!(capabilities & service)) if (!(capabilities & service))
continue; continue;
if (!pcie_device_init(dev, service, irqs[i]))
status = pcie_device_init(dev, service, irqs[i]); nr_service++;
if (!status)
nr_serv++;
} }
if (!nr_serv) { if (!nr_service)
status = -ENODEV;
goto error_cleanup_irqs; goto error_cleanup_irqs;
}
return 0; return 0;
error_cleanup_irqs: error_cleanup_irqs: