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

Commit 7391c6dc authored by Douglas Thompson's avatar Douglas Thompson Committed by Linus Torvalds
Browse files

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: default avatarDouglas Thompson <dougthompson@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 52490c8d

drivers/edac/edac_core.h

+0 −2
Original line number Diff line number Diff line
@@ -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:

 *

drivers/edac/edac_device.c

+3 −6
Original line number Diff line number Diff line
@@ -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)

drivers/edac/edac_mc.c

+4 −5
Original line number Diff line number Diff line
@@ -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;

drivers/edac/edac_module.h

+1 −0
Original line number Diff line number Diff line
@@ -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