diff options
| author | Douglas Thompson <dougthompson@xmission.com> | 2007-07-19 01:50:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 10:04:56 -0700 |
| commit | 7391c6dcab3094610cb99bbd559beaa282582eac (patch) | |
| tree | 29ec05cc8abdb9be8311ea797b29c9c5b9a99aea /drivers/edac | |
| parent | 52490c8d07680a7ecc3c1a70a16841455d37e96a (diff) | |
| download | blackbird-op-linux-7391c6dcab3094610cb99bbd559beaa282582eac.tar.gz blackbird-op-linux-7391c6dcab3094610cb99bbd559beaa282582eac.zip | |
drivers/edac: mod edac_align_ptr function
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>
Diffstat (limited to 'drivers/edac')
| -rw-r--r-- | drivers/edac/edac_core.h | 2 | ||||
| -rw-r--r-- | drivers/edac/edac_device.c | 9 | ||||
| -rw-r--r-- | drivers/edac/edac_mc.c | 9 | ||||
| -rw-r--r-- | drivers/edac/edac_module.h | 1 |
4 files changed, 8 insertions, 13 deletions
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index fa3ff8c25b36..d8435297df3d 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h @@ -211,8 +211,6 @@ enum scrub_type { #define OP_RUNNING_POLL_INTR 0x203 #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: * diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 3ccadda3e723..d60f5df87af5 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c @@ -89,17 +89,14 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info( dev_ctl = (struct edac_device_ctl_info *)NULL; /* Calc the 'end' offset past the ctl_info structure */ - dev_inst = (struct edac_device_instance *) - edac_align_ptr(&dev_ctl[1], sizeof(*dev_inst)); + dev_inst = edac_align_ptr(&dev_ctl[1], sizeof(*dev_inst)); /* Calc the 'end' offset past the instance array */ - dev_blk = (struct edac_device_block *) - edac_align_ptr(&dev_inst[nr_instances], sizeof(*dev_blk)); + dev_blk = edac_align_ptr(&dev_inst[nr_instances], sizeof(*dev_blk)); /* Calc the 'end' offset past the dev_blk array */ count = nr_instances * nr_blocks; - dev_attrib = (struct edac_attrib *) - edac_align_ptr(&dev_blk[count], sizeof(*dev_attrib)); + dev_attrib = edac_align_ptr(&dev_blk[count], sizeof(*dev_attrib)); /* Check for case of NO attributes specified */ if (nr_attribs > 0) diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 219e861eb3f9..856860314789 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -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 * 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; @@ -109,7 +109,7 @@ char *edac_align_ptr(void *ptr, unsigned size) if (r == 0) 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. */ mci = (struct mem_ctl_info *)0; - csi = (struct csrow_info *)edac_align_ptr(&mci[1], sizeof(*csi)); - chi = (struct channel_info *) - edac_align_ptr(&csi[nr_csrows], sizeof(*chi)); + csi = edac_align_ptr(&mci[1], sizeof(*csi)); + chi = edac_align_ptr(&csi[nr_csrows], sizeof(*chi)); pvt = edac_align_ptr(&chi[nr_chans * nr_csrows], sz_pvt); size = ((unsigned long)pvt) + sz_pvt; diff --git a/drivers/edac/edac_module.h b/drivers/edac/edac_module.h index 0869fbaa733c..37a08aa87d3e 100644 --- a/drivers/edac/edac_module.h +++ b/drivers/edac/edac_module.h @@ -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_reset_delay_period(struct edac_device_ctl_info *edac_dev, unsigned long value); +extern void *edac_align_ptr(void *ptr, unsigned size); /* * EDAC PCI functions |
