]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
PCI hotplug: Use kmemdup
authorJulia Lawall <julia@diku.dk>
Sat, 15 May 2010 21:18:16 +0000 (23:18 +0200)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 18 May 2010 22:02:09 +0000 (15:02 -0700)
Use kmemdup when some other buffer is immediately copied into the
allocated region.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression from,to,size,flag;
statement S;
@@

-  to = \(kmalloc\|kzalloc\)(size,flag);
+  to = kmemdup(from,size,flag);
   if (to==NULL || ...) S
-  memcpy(to, from, size);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/pci/hotplug/cpqphp_core.c

index f184d1d2ecbebfc9b7f1d27371d8b12af77610f1..cb7818ffd5cf4a0bb655785dff3a3ff1c8be6b1c 100644 (file)
@@ -1075,13 +1075,12 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        /* make our own copy of the pci bus structure,
         * as we like tweaking it a lot */
-       ctrl->pci_bus = kmalloc(sizeof(*ctrl->pci_bus), GFP_KERNEL);
+       ctrl->pci_bus = kmemdup(pdev->bus, sizeof(*ctrl->pci_bus), GFP_KERNEL);
        if (!ctrl->pci_bus) {
                err("out of memory\n");
                rc = -ENOMEM;
                goto err_free_ctrl;
        }
-       memcpy(ctrl->pci_bus, pdev->bus, sizeof(*ctrl->pci_bus));
 
        ctrl->bus = pdev->bus->number;
        ctrl->rev = pdev->revision;