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

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

PCI: pcie, aer: checkpatch style cleanup in pcie/aer/* 



Before:
 drivers/pci/pcie/aer/aer_inject.c
  total: 4 errors, 4 warnings, 473 lines checked
 drivers/pci/pcie/aer/aerdrv.c
  total: 5 errors, 2 warnings, 333 lines checked
 drivers/pci/pcie/aer/aerdrv.h
  total: 1 errors, 0 warnings, 139 lines checked
 drivers/pci/pcie/aer/aerdrv_core.c
  total: 4 errors, 3 warnings, 872 lines checked
 drivers/pci/pcie/aer/aerdrv_errprint.c
  total: 12 errors, 11 warnings, 248 lines checked

After:
 drivers/pci/pcie/aer/aer_inject.c
  total: 0 errors, 0 warnings, 466 lines checked
 drivers/pci/pcie/aer/aerdrv.c
  total: 0 errors, 0 warnings, 335 lines checked
 drivers/pci/pcie/aer/aerdrv.h
  total: 0 errors, 0 warnings, 139 lines checked
 drivers/pci/pcie/aer/aerdrv_core.c
  total: 0 errors, 0 warnings, 869 lines checked
 drivers/pci/pcie/aer/aerdrv_errprint.c
  total: 0 errors, 10 warnings, 247 lines checked

Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Reviewed-by: default avatarAndrew Patterson <andrew.patterson@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent b439b1d4

drivers/pci/pcie/aer/aer_inject.c

+9 −16
Original line number Diff line number Diff line
@@ -22,11 +22,10 @@ 
#include <linux/miscdevice.h>

#include <linux/pci.h>

#include <linux/fs.h>

#include <asm/uaccess.h>

#include <linux/uaccess.h>

#include "aerdrv.h"



struct aer_error_inj

{

struct aer_error_inj {

	u8 bus;

	u8 dev;

	u8 fn;
@@ -38,8 +37,7 @@ struct aer_error_inj 
	u32 header_log3;

};



struct aer_error

{

struct aer_error {

	struct list_head list;

	unsigned int bus;

	unsigned int devfn;
@@ -55,8 +53,7 @@ struct aer_error 
	u32 source_id;

};



struct pci_bus_ops

{

struct pci_bus_ops {

	struct list_head list;

	struct pci_bus *bus;

	struct pci_ops *ops;
@@ -258,7 +255,6 @@ static int pci_bus_set_aer_ops(struct pci_bus *bus) 
	bus_ops = NULL;

out:

	spin_unlock_irqrestore(&inject_lock, flags);

	if (bus_ops)

	kfree(bus_ops);

	return 0;

}
@@ -401,9 +397,7 @@ static int aer_inject(struct aer_error_inj *einj) 
	else

		ret = -EINVAL;

out_put:

	if (err_alloc)

	kfree(err_alloc);

	if (rperr_alloc)

	kfree(rperr_alloc);

	pci_dev_put(dev);

	return ret;
@@ -458,8 +452,7 @@ static void __exit aer_inject_exit(void) 
	}



	spin_lock_irqsave(&inject_lock, flags);

	list_for_each_entry_safe(err, err_next,

				 &pci_bus_ops_list, list) {

	list_for_each_entry_safe(err, err_next, &pci_bus_ops_list, list) {

		list_del(&err->list);

		kfree(err);

	}

drivers/pci/pcie/aer/aerdrv.c

+12 −10
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ static struct aer_rpc* aer_alloc_rpc(struct pcie_device *dev) 
{

	struct aer_rpc *rpc;



	if (!(rpc = kzalloc(sizeof(struct aer_rpc),

		GFP_KERNEL)))

	rpc = kzalloc(sizeof(struct aer_rpc), GFP_KERNEL);

	if (!rpc)

		return NULL;



	/*
@@ -196,19 +196,21 @@ static int __devinit aer_probe (struct pcie_device *dev) 
	struct device *device = &dev->device;



	/* Init */

	if ((status = aer_init(dev)))

	status = aer_init(dev);

	if (status)

		return status;



	/* Alloc rpc data structure */

	if (!(rpc = aer_alloc_rpc(dev))) {

	rpc = aer_alloc_rpc(dev);

	if (!rpc) {

		dev_printk(KERN_DEBUG, device, "alloc rpc failed\n");

		aer_remove(dev);

		return -ENOMEM;

	}



	/* Request IRQ ISR */

	if ((status = request_irq(dev->irq, aer_irq, IRQF_SHARED, "aerdrv",

				dev))) {

	status = request_irq(dev->irq, aer_irq, IRQF_SHARED, "aerdrv", dev);

	if (status) {

		dev_printk(KERN_DEBUG, device, "request IRQ failed\n");

		aer_remove(dev);

		return status;

drivers/pci/pcie/aer/aerdrv.h

+3 −3
Original line number Diff line number Diff line
@@ -136,4 +136,4 @@ static inline int aer_osc_setup(struct pcie_device *pciedev) 
}

#endif



#endif //_AERDRV_H_
 
#endif /* _AERDRV_H_ */

drivers/pci/pcie/aer/aerdrv_core.c

+14 −17
Original line number Diff line number Diff line
@@ -49,10 +49,11 @@ int pci_enable_pcie_error_reporting(struct pci_dev *dev) 
		PCI_EXP_DEVCTL_NFERE |

		PCI_EXP_DEVCTL_FERE |

		PCI_EXP_DEVCTL_URRE;

	pci_write_config_word(dev, pos+PCI_EXP_DEVCTL,

			reg16);

	pci_write_config_word(dev, pos+PCI_EXP_DEVCTL, reg16);



	return 0;

}

EXPORT_SYMBOL_GPL(pci_enable_pcie_error_reporting);



int pci_disable_pcie_error_reporting(struct pci_dev *dev)

{
@@ -68,10 +69,11 @@ int pci_disable_pcie_error_reporting(struct pci_dev *dev) 
			PCI_EXP_DEVCTL_NFERE |

			PCI_EXP_DEVCTL_FERE |

			PCI_EXP_DEVCTL_URRE);

	pci_write_config_word(dev, pos+PCI_EXP_DEVCTL,

			reg16);

	pci_write_config_word(dev, pos+PCI_EXP_DEVCTL, reg16);



	return 0;

}

EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting);



int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)

{
@@ -92,6 +94,7 @@ int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev) 


	return 0;

}

EXPORT_SYMBOL_GPL(pci_cleanup_aer_uncorrect_error_status);



#if 0

int pci_cleanup_aer_correct_error_status(struct pci_dev *dev)
@@ -110,7 +113,6 @@ int pci_cleanup_aer_correct_error_status(struct pci_dev *dev) 
}

#endif  /*  0  */





static int set_device_error_reporting(struct pci_dev *dev, void *data)

{

	bool enable = *((bool *)data);
@@ -164,7 +166,8 @@ static int add_error_device(struct aer_err_info *e_info, struct pci_dev *dev) 
		e_info->dev[e_info->error_dev_num] = dev;

		e_info->error_dev_num++;

		return 1;

	} else

	}



	return 0;

}
@@ -411,8 +414,7 @@ static pci_ers_result_t broadcast_error_message(struct pci_dev *dev, 
			pci_cleanup_aer_uncorrect_error_status(dev);

			dev->error_state = pci_channel_io_normal;

		}

	}

	else {

	} else {

		/*

		 * If the error is reported by an end point, we think this

		 * error is related to the upstream link of the end point.
@@ -865,8 +867,3 @@ int aer_init(struct pcie_device *dev) 


	return AER_SUCCESS;

}
 


EXPORT_SYMBOL_GPL(pci_enable_pcie_error_reporting);

EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting);

EXPORT_SYMBOL_GPL(pci_cleanup_aer_uncorrect_error_status);

drivers/pci/pcie/aer/aerdrv_errprint.c

+24 −25
Original line number Diff line number Diff line
@@ -245,4 +245,3 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info) 
		}

	}

}