edac: rewrite edac_align_ptr()

The edac_align_ptr() function is used to prepare data for a single
memory allocation kzalloc() call. It counts how many bytes are needed
by some data structure.

Using it as-is is not that trivial, as the quantity of memory elements
reserved is not there, but, instead, it is on a next call.

In order to avoid mistakes when using it, move the number of allocated
elements into it, making easier to use it.

Reviewed-by: Borislav Petkov <bp@amd64.org>
Cc: Aristeu Rozanski <arozansk@redhat.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
index 63af1c5673d1..f1ac86649886 100644
--- a/drivers/edac/edac_pci.c
+++ b/drivers/edac/edac_pci.c
@@ -42,13 +42,13 @@ struct edac_pci_ctl_info *edac_pci_alloc_ctl_info(unsigned int sz_pvt,
                                                 const char *edac_pci_name)
 {
         struct edac_pci_ctl_info *pci;
-        void *pvt;
+        void *p = NULL, *pvt;
         unsigned int size;
 
         debugf1("%s()\n", __func__);
 
-        pci = (struct edac_pci_ctl_info *)0;
-        pvt = edac_align_ptr(&pci[1], sz_pvt);
+        pci = edac_align_ptr(&p, sizeof(*pci), 1);
+        pvt = edac_align_ptr(&p, 1, sz_pvt);
         size = ((unsigned long)pvt) + sz_pvt;
 
         /* Alloc the needed control struct memory */