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

Commit 40da4186 authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by Jesse Barnes
Browse files

PCI: pcie portdrv: style cleanup 



No change in logic.

Before:
  drivers/pci/pcie/portdrv_core.c:
    total: 7 errors, 2 warnings, 508 lines checked
  drivers/pci/pcie/portdrv_pci.c:
    total: 4 errors, 2 warnings, 300 lines checked

After:
  drivers/pci/pcie/portdrv_core.c:
    total: 0 errors, 0 warnings, 506 lines checked
  drivers/pci/pcie/portdrv_pci.c:
    total: 0 errors, 0 warnings, 299 lines checked

Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 45d28b09

drivers/pci/pcie/portdrv_core.c

+7 −9
Original line number Diff line number Diff line
@@ -346,8 +346,7 @@ static int suspend_iter(struct device *dev, void *data) 
{

	struct pcie_port_service_driver *service_driver;



 	if ((dev->bus == &pcie_port_bus_type) &&

 	    (dev->driver)) {

	if ((dev->bus == &pcie_port_bus_type) && dev->driver) {

		service_driver = to_service_driver(dev->driver);

		if (service_driver->suspend)

			service_driver->suspend(to_pcie_device(dev));
@@ -494,6 +493,7 @@ int pcie_port_service_register(struct pcie_port_service_driver *new) 


	return driver_register(&new->driver);

}

EXPORT_SYMBOL(pcie_port_service_register);



/**

 * pcie_port_service_unregister - unregister PCI Express port service driver
@@ -503,6 +503,4 @@ void pcie_port_service_unregister(struct pcie_port_service_driver *drv) 
{

	driver_unregister(&drv->driver);

}



EXPORT_SYMBOL(pcie_port_service_register);

EXPORT_SYMBOL(pcie_port_service_unregister);

drivers/pci/pcie/portdrv_pci.c

+8 −9
Original line number Diff line number Diff line
@@ -129,14 +129,13 @@ static int error_detected_iter(struct device *device, void *data) 
static pci_ers_result_t pcie_portdrv_error_detected(struct pci_dev *dev,

					enum pci_channel_state error)

{

	struct aer_broadcast_data result_data =

			{error, PCI_ERS_RESULT_CAN_RECOVER};

	int retval;

	struct aer_broadcast_data data = {error, PCI_ERS_RESULT_CAN_RECOVER};

	int ret;



	/* can not fail */

	retval = device_for_each_child(&dev->dev, &result_data, error_detected_iter);

	ret = device_for_each_child(&dev->dev, &data, error_detected_iter);



	return result_data.result;

	return data.result;

}



static int mmio_enabled_iter(struct device *device, void *data)