lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/edac: mod edac_align_ptr function

Browse Source 
Refactor the edac_align_ptr() function to reduce the noise of casting the
aligned pointer to the various types of data objects and modified its callers
to its new signature

Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Douglas Thompson
2007-07-19 01:50:21 -07:00
committed by Linus Torvalds
parent 52490c8d07
commit 7391c6dcab
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/edac/edac_core.h
View File

@@ -211,8 +211,6 @@ enum scrub_type {
#define OP_RUNNING_POLL_INTR 0x203 #define OP_RUNNING_POLL_INTR 0x203
#define OP_OFFLINE 0x300 #define OP_OFFLINE 0x300
extern char *edac_align_ptr(void *ptr, unsigned size);
/* /*
* There are several things to be aware of that aren't at all obvious: * There are several things to be aware of that aren't at all obvious:
* *

9
drivers/edac/edac_device.c
View File

@@ -89,17 +89,14 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
dev_ctl = (struct edac_device_ctl_info *)NULL; dev_ctl = (struct edac_device_ctl_info *)NULL;
/* Calc the 'end' offset past the ctl_info structure */ /* Calc the 'end' offset past the ctl_info structure */
dev_inst = (struct edac_device_instance *) dev_inst = edac_align_ptr(&dev_ctl[1], sizeof(*dev_inst));
edac_align_ptr(&dev_ctl[1], sizeof(*dev_inst));
/* Calc the 'end' offset past the instance array */ /* Calc the 'end' offset past the instance array */
dev_blk = (struct edac_device_block *) dev_blk = edac_align_ptr(&dev_inst[nr_instances], sizeof(*dev_blk));
edac_align_ptr(&dev_inst[nr_instances], sizeof(*dev_blk));
/* Calc the 'end' offset past the dev_blk array */ /* Calc the 'end' offset past the dev_blk array */
count = nr_instances * nr_blocks; count = nr_instances * nr_blocks;
dev_attrib = (struct edac_attrib *) dev_attrib = edac_align_ptr(&dev_blk[count], sizeof(*dev_attrib));
edac_align_ptr(&dev_blk[count], sizeof(*dev_attrib));
/* Check for case of NO attributes specified */ /* Check for case of NO attributes specified */
if (nr_attribs > 0) if (nr_attribs > 0)

9
drivers/edac/edac_mc.c
View File

@@ -85,7 +85,7 @@ static void edac_mc_dump_mci(struct mem_ctl_info *mci)
* If 'size' is a constant, the compiler will optimize this whole function * If 'size' is a constant, the compiler will optimize this whole function
* down to either a no-op or the addition of a constant to the value of 'ptr'. * down to either a no-op or the addition of a constant to the value of 'ptr'.
*/ */
char *edac_align_ptr(void *ptr, unsigned size) void *edac_align_ptr(void *ptr, unsigned size)
{ {
unsigned align, r; unsigned align, r;
@@ -109,7 +109,7 @@ char *edac_align_ptr(void *ptr, unsigned size)
if (r == 0) if (r == 0)
return (char *)ptr; return (char *)ptr;
return (char *)(((unsigned long)ptr) + align - r); return (void *)(((unsigned long)ptr) + align - r);
} }
/** /**
@@ -144,9 +144,8 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
* hardcode everything into a single struct. * hardcode everything into a single struct.
*/ */
mci = (struct mem_ctl_info *)0; mci = (struct mem_ctl_info *)0;
csi = (struct csrow_info *)edac_align_ptr(&mci[1], sizeof(*csi)); csi = edac_align_ptr(&mci[1], sizeof(*csi));
chi = (struct channel_info *) chi = edac_align_ptr(&csi[nr_csrows], sizeof(*chi));
edac_align_ptr(&csi[nr_csrows], sizeof(*chi));
pvt = edac_align_ptr(&chi[nr_chans * nr_csrows], sz_pvt); pvt = edac_align_ptr(&chi[nr_chans * nr_csrows], sz_pvt);
size = ((unsigned long)pvt) + sz_pvt; size = ((unsigned long)pvt) + sz_pvt;

1
drivers/edac/edac_module.h
View File

@@ -44,6 +44,7 @@ extern void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev,
extern void edac_device_workq_teardown(struct edac_device_ctl_info *edac_dev); extern void edac_device_workq_teardown(struct edac_device_ctl_info *edac_dev);
extern void edac_device_reset_delay_period(struct edac_device_ctl_info extern void edac_device_reset_delay_period(struct edac_device_ctl_info
*edac_dev, unsigned long value); *edac_dev, unsigned long value);
extern void *edac_align_ptr(void *ptr, unsigned size);
/* /*
* EDAC PCI functions * EDAC PCI functions