diff options
Diffstat (limited to 'drivers/mcb')
| -rw-r--r-- | drivers/mcb/mcb-core.c | 4 | ||||
| -rw-r--r-- | drivers/mcb/mcb-parse.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mcb/mcb-core.c b/drivers/mcb/mcb-core.c index 3d487d75c483..ce17092d5c1f 100644 --- a/drivers/mcb/mcb-core.c +++ b/drivers/mcb/mcb-core.c @@ -274,7 +274,7 @@ struct mcb_bus *mcb_alloc_bus(struct device *carrier) int bus_nr; int rc; - bus = kzalloc(sizeof(struct mcb_bus), GFP_KERNEL); + bus = kzalloc_obj(struct mcb_bus, GFP_KERNEL); if (!bus) return ERR_PTR(-ENOMEM); @@ -366,7 +366,7 @@ struct mcb_device *mcb_alloc_dev(struct mcb_bus *bus) { struct mcb_device *dev; - dev = kzalloc(sizeof(struct mcb_device), GFP_KERNEL); + dev = kzalloc_obj(struct mcb_device, GFP_KERNEL); if (!dev) return NULL; diff --git a/drivers/mcb/mcb-parse.c b/drivers/mcb/mcb-parse.c index bf0d7d58c8b0..934f8d96922d 100644 --- a/drivers/mcb/mcb-parse.c +++ b/drivers/mcb/mcb-parse.c @@ -146,15 +146,14 @@ static int chameleon_get_bar(void __iomem **base, phys_addr_t mapbase, if (bar_count <= 0 || bar_count > CHAMELEON_BAR_MAX) return -ENODEV; - c = kcalloc(bar_count, sizeof(struct chameleon_bar), - GFP_KERNEL); + c = kzalloc_objs(struct chameleon_bar, bar_count, GFP_KERNEL); if (!c) return -ENOMEM; chameleon_parse_bar(*base, c, bar_count); *base += BAR_DESC_SIZE(bar_count); } else { - c = kzalloc(sizeof(struct chameleon_bar), GFP_KERNEL); + c = kzalloc_obj(struct chameleon_bar, GFP_KERNEL); if (!c) return -ENOMEM; |