As we did massive changes on edac_core.h, let's take the opportunity to make checkpatch happy where possible. Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxxx> --- drivers/edac/edac_core.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index 9861357d4dbc..4e14d038d1d0 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h @@ -94,7 +94,7 @@ do { \ #define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \ PCI_DEVICE_ID_ ## vend ## _ ## dev -#define edac_dev_name(dev) (dev)->dev_name +#define edac_dev_name(dev) ((dev)->dev_name) #define to_mci(k) container_of(k, struct mem_ctl_info, dev) @@ -259,7 +259,7 @@ struct edac_device_ctl_info { int log_ue; int log_ce; int panic_on_ue; - unsigned poll_msec; + unsigned int poll_msec; unsigned long delay; struct edac_dev_sysfs_attribute *sysfs_attributes; @@ -270,7 +270,7 @@ struct edac_device_ctl_info { struct delayed_work work; - void (*edac_check) (struct edac_device_ctl_info * edac_dev); + void (*edac_check)(struct edac_device_ctl_info *edac_dev); struct device *dev; @@ -305,7 +305,7 @@ struct edac_device_ctl_info { container_of(w, struct mem_ctl_info, work) #define to_edac_device_ctl_work(w) \ - container_of(w,struct edac_device_ctl_info,work) + container_of(w, struct edac_device_ctl_info, work) /** * edac_device_alloc_ctl_info() - Allocate and create a generic control @@ -345,15 +345,15 @@ struct edac_device_ctl_info { * Returns: pointer to edac_device_alloc_ctl_info if success, %NULL otherwise. */ extern struct edac_device_ctl_info *edac_device_alloc_ctl_info( - unsigned sizeof_private, - char *edac_device_name, unsigned nr_instances, - char *edac_block_name, unsigned nr_blocks, - unsigned offset_value, + unsigned int sizeof_private, + char *edac_device_name, unsigned int nr_instances, + char *edac_block_name, unsigned int nr_blocks, + unsigned int offset_value, struct edac_dev_sysfs_block_attribute *block_attributes, - unsigned nr_attribs, + unsigned int nr_attribs, int device_index); -#define BLOCK_OFFSET_VALUE_OFF ((unsigned) -1) +#define BLOCK_OFFSET_VALUE_OFF ((unsigned int) -1) /** * edac_device_free_ctl_info() - Frees a struct edac_device_ctl_info pointer @@ -411,7 +411,7 @@ struct edac_pci_ctl_info { int op_state; struct delayed_work work; - void (*edac_check) (struct edac_pci_ctl_info * edac_dev); + void (*edac_check)(struct edac_pci_ctl_info *edac_dev); struct device *dev; @@ -433,7 +433,7 @@ struct edac_pci_ctl_info { }; #define to_edac_pci_ctl_work(w) \ - container_of(w, struct edac_pci_ctl_info,work) + container_of(w, struct edac_pci_ctl_info, work) /** * pci_write_bits8() - Ancillary routine to write all or some bits in a @@ -539,10 +539,10 @@ static inline void pci_write_bits32(struct pci_dev *pdev, int offset, * On success, return a pointer to struct mem_ctl_info pointer; * %NULL otherwise */ -struct mem_ctl_info *edac_mc_alloc(unsigned mc_num, - unsigned n_layers, +struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, + unsigned int n_layers, struct edac_mc_layer *layers, - unsigned sz_pvt); + unsigned int sz_pvt); /** * edac_mc_add_mc_with_groups() - Insert the @mci structure into the mci -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html